[#1469] Prepare releng to start 4.1.0 development

- updated baseline (update baseline version from 3.1.0 to 4.0.0) - bumped licenses.ecore version (nsURI), migration supplied Signed-off-by: Nikifor Fedorov <[email protected]>
eclipse-passage · Nov 25, 2024 · 8a29be2 · 8a29be2
1 parent c1636ad
commit 8a29be2
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/bundles/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore b/bundles/org.eclipse.passage.lic.licenses.ecore/model/licenses.ecore
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="licenses" nsURI="http://www.eclipse.org/passage/lic/licenses/4.0.0"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="licenses" nsURI="http://www.eclipse.org/passage/lic/licenses/4.1.0"
     nsPrefix="org.eclipse.passage.lic">
   <eClassifiers xsi:type="ecore:EClass" name="AgreementData">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

diff --git a/bundles/org.eclipse.passage.lic.licenses.model/plugin.xml b/bundles/org.eclipse.passage.lic.licenses.model/plugin.xml
@@ -18,7 +18,7 @@
    <extension point="org.eclipse.emf.ecore.generated_package">
       <!-- @generated licenses -->
       <package
-            uri="http://www.eclipse.org/passage/lic/licenses/4.0.0"
+            uri="http://www.eclipse.org/passage/lic/licenses/4.1.0"
             class="org.eclipse.passage.lic.licenses.model.meta.LicensesPackage"
             genModel="model/licenses.genmodel"/>
    </extension>

diff --git a/...c.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/meta/LicensesPackage.java b/...c.licenses.model/src-gen/org/eclipse/passage/lic/licenses/model/meta/LicensesPackage.java
@@ -48,7 +48,7 @@ public interface LicensesPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_URI = "http://www.eclipse.org/passage/lic/licenses/4.0.0"; //$NON-NLS-1$
+	String eNS_URI = "http://www.eclipse.org/passage/lic/licenses/4.1.0"; //$NON-NLS-1$
 
 	/**
 	 * The package namespace name.

diff --git a/...rc/org/eclipse/passage/lic/internal/licenses/model/migration/LicensesResourceHandler.java b/...rc/org/eclipse/passage/lic/internal/licenses/model/migration/LicensesResourceHandler.java
@@ -45,6 +45,7 @@ protected final void register() {
 		migrate110();
 		migrate200();
 		migrate300();
+		migrate400();
 	}
 
 	@Override
@@ -153,4 +154,10 @@ private void migrate300() {
 		EPackage.Registry.INSTANCE.computeIfAbsent(uri, ns -> delegate);
 	}
 
+	private void migrate400() {
+		String uri = "http://www.eclipse.org/passage/lic/licenses/4.0.0"; //$NON-NLS-1$
+		LicensesPackage delegate = LicensesPackage.eINSTANCE;
+		EPackage.Registry.INSTANCE.computeIfAbsent(uri, ns -> delegate);
+	}
+
 }
diff --git a/releng/org.eclipse.passage.target/org.eclipse.passage.baseline.target b/releng/org.eclipse.passage.target/org.eclipse.passage.baseline.target
@@ -19,20 +19,20 @@
 			<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/eclipse/updates/4.33-I-builds/"/>
+			<repository location="https://download.eclipse.org/eclipse/updates/4.34-I-builds/I20241120-1800/"/>
 			<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.39.0/"/>
+			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.40.0/"/>
 			<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/passage/updates/release/3.1.0/"/>
+			<repository location="https://download.eclipse.org/passage/updates/release/4.0.0/"/>
 			<unit id="org.eclipse.passage.ldc.feature.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.passage.lic.define.feature.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09/"/>
+			<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12/"/>
 			<unit id="bcpg" version="0.0.0"/>
 			<unit id="bcpkix" version="0.0.0"/>
 			<unit id="bcprov" version="0.0.0"/>