From a66178d7e1dfbe8b4b144a6c440f6e91010989fb Mon Sep 17 00:00:00 2001
From: Jonah Graham <jonah@kichwacoders.com>
Date: Thu, 4 May 2023 09:52:56 -0400
Subject: [PATCH] Prep repo for 2023-06 M2

---
 .../epp.website.xml                                         | 2 +-
 .../org.eclipse.epp.package.cpp.feature/epp.website.xml     | 2 +-
 .../org.eclipse.epp.package.dsl.feature/epp.website.xml     | 2 +-
 .../epp.website.xml                                         | 2 +-
 .../org.eclipse.epp.package.java.feature/epp.website.xml    | 2 +-
 .../org.eclipse.epp.package.jee.feature/epp.website.xml     | 2 +-
 .../epp.website.xml                                         | 2 +-
 .../epp.website.xml                                         | 2 +-
 .../org.eclipse.epp.package.php.feature/epp.website.xml     | 2 +-
 .../org.eclipse.epp.package.rcp.feature/epp.website.xml     | 2 +-
 .../org.eclipse.epp.package.scout.feature/epp.website.xml   | 2 +-
 releng/org.eclipse.epp.config/parent/pom.xml                | 6 +++---
 12 files changed, 14 insertions(+), 14 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
index 4b9ac695b..2d0ec733e 100644
--- 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-M1" />
+  <product name="eclipse-committers-2023-06-M2" />
 
 </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
index 6c14d1776..73f0113b0 100644
--- 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-M1" />
+  <product name="eclipse-cpp-2023-06-M2" />
 
 </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
index 1475f7796..8f852cdf7 100644
--- 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-M1" />
+  <product name="eclipse-dsl-2023-06-M2" />
 
 </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
index edb89104d..a478b3045 100644
--- 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-M1" />
+  <product name="eclipse-embedcpp-2023-06-M2" />
 
 </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
index e204a7973..ca5bde892 100644
--- 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-M1" />
+	<product name="eclipse-java-2023-06-M2" />
 
 </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
index ab54ea14e..d6d1dbc3b 100644
--- 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-M1" />
+  <product name="eclipse-jee-2023-06-M2" />
 
 </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
index c44f99c4a..ae97588f1 100644
--- 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-M1" />
+  <product name="eclipse-modeling-2023-06-M2" />
 
 </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
index 0cd678a13..b45d36b03 100644
--- 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-M1" />
+	<product name="eclipse-parallel-2023-06-M2" />
 
 </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
index 4979a2808..4818917d5 100644
--- 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-M1" />
+  <product name="eclipse-php-2023-06-M2" />
 
 </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
index 6074e3258..f1bcb6db8 100644
--- 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-M1" />
+  <product name="eclipse-rcp-2023-06-M2" />
 
 </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
index 4b62bdbd9..abaaae2ea 100644
--- 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-M1" />
+  <product name="eclipse-scout-2023-06-M2" />
 
 </configuration>
diff --git a/releng/org.eclipse.epp.config/parent/pom.xml b/releng/org.eclipse.epp.config/parent/pom.xml
index ae624f6a0..4fa650481 100644
--- a/releng/org.eclipse.epp.config/parent/pom.xml
+++ b/releng/org.eclipse.epp.config/parent/pom.xml
@@ -38,13 +38,13 @@
     <!-- Name of the release (no milestone) -->
     <RELEASE_NAME>2023-06</RELEASE_NAME>
     <!-- Name of the milestone -->
-    <RELEASE_MILESTONE>M1</RELEASE_MILESTONE>
+    <RELEASE_MILESTONE>M2</RELEASE_MILESTONE>
     <!-- Version of the release -->
     <RELEASE_VERSION>4.28.0</RELEASE_VERSION>
     <!-- Name release directory on download.eclipse.org -->
-    <RELEASE_DIR>202304121200</RELEASE_DIR>
+    <RELEASE_DIR>202305041200</RELEASE_DIR>
     <!-- SimRel Repo to build from -->
-    <SIMREL_REPO>https://download.eclipse.org/staging/2023-06</SIMREL_REPO>
+    <SIMREL_REPO>https://download.eclipse.org/releases/2023-06/202305051000/</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) -->