From f4fe3d0db9c8fd7bf6cc3dcb7cf8ecd36c8aa09e Mon Sep 17 00:00:00 2001
From: Alexander Fedorov <alexander.fedorov@arsysop.ru>
Date: Tue, 6 Dec 2022 12:24:08 +0300
Subject: [PATCH 1/2] Prepare releng for 2.6.1 release #1177

Update baseline and current target

Signed-off-by: Alexander Fedorov <alexander.fedorov@arsysop.ru>
---
 releng/org.eclipse.passage.parent/pom.xml     |  4 +-
 .../org.eclipse.passage.releng/passage.setup  | 38 ++++++++--------
 .../org.eclipse.passage.baseline.target       | 43 +++++++++----------
 .../org.eclipse.passage.target.target         |  8 ++--
 4 files changed, 44 insertions(+), 49 deletions(-)

diff --git a/releng/org.eclipse.passage.parent/pom.xml b/releng/org.eclipse.passage.parent/pom.xml
index 7b35cf005..e8f82c0f2 100644
--- a/releng/org.eclipse.passage.parent/pom.xml
+++ b/releng/org.eclipse.passage.parent/pom.xml
@@ -41,8 +41,8 @@
 		<eclipse-repo.url>https://repo.eclipse.org/content/repositories/cbi/</eclipse-repo.url>
 		<cbi-snapshots-repo.url>https://repo.eclipse.org/content/repositories/cbi-snapshots/</cbi-snapshots-repo.url>
 
-		<eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.24/R-4.24-202206070700/</eclipserun-repo>
-		<released.baseline>https://download.eclipse.org/passage/updates/release/2.5.0/</released.baseline>
+		<eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.26/R-4.26-202211231800/</eclipserun-repo>
+		<released.baseline>https://download.eclipse.org/passage/updates/release/2.6.0/</released.baseline>
 		<staging.baseline>https://download.eclipse.org/passage/drops/integration/latest/</staging.baseline>
 
 		<compare-version-with-baselines.skip>true</compare-version-with-baselines.skip>
diff --git a/releng/org.eclipse.passage.releng/passage.setup b/releng/org.eclipse.passage.releng/passage.setup
index 3c2ca9e81..0c94393c0 100644
--- a/releng/org.eclipse.passage.releng/passage.setup
+++ b/releng/org.eclipse.passage.releng/passage.setup
@@ -118,6 +118,8 @@
             name="com.sun.jna"/>
         <requirement
             name="com.sun.jna.platform"/>
+        <requirement
+            name="jakarta.servlet"/>
         <requirement
             name="javax.activation"/>
         <requirement
@@ -182,35 +184,33 @@
         <repositoryList
             name="Passage Latest Released">
           <repository
-              url="https://download.eclipse.org/eclipse/updates/4.24/R-4.24-202206070700/"/>
+              url="https://download.eclipse.org/eclipse/updates/4.26/R-4.26-202211231800/"/>
           <repository
-              url="https://download.eclipse.org/ecp/rt/1261/"/>
+              url="https://download.eclipse.org/ecp/rt/1270/"/>
           <repository
-              url="https://download.eclipse.org/modeling/emf/emf/builds/release/2.30/"/>
+              url="https://download.eclipse.org/modeling/emf/emf/builds/release/2.32/"/>
           <repository
-              url="https://download.eclipse.org/modeling/emf/query/updates/releases/R201805030653/"/>
+              url="https://download.eclipse.org/modeling/emf/query/updates/releases/R202208101410/"/>
           <repository
-              url="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R201805140824/"/>
+              url="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R202208110935/"/>
           <repository
-              url="https://download.eclipse.org/modeling/emf/validation/updates/releases/R202008210805/"/>
+              url="https://download.eclipse.org/modeling/emf/validation/updates/releases/R202208271102/"/>
           <repository
-              url="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202004160913/"/>
+              url="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334/"/>
           <repository
-              url="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202106221344/"/>
+              url="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202211041032/"/>
           <repository
-              url="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.17.1/"/>
+              url="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.18.0/"/>
           <repository
               url="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5/"/>
           <repository
-              url="https://download.eclipse.org/passage/updates/release/2.5.0/"/>
-          <repository
-              url="https://download.eclipse.org/sirius/updates/releases/6.5.1/2020-09/"/>
+              url="https://download.eclipse.org/passage/updates/release/2.6.0/"/>
           <repository
-              url="https://download.eclipse.org/tools/gef/updates/legacy/releases/4.0.0_gef-master_1952/"/>
+              url="https://download.eclipse.org/sirius/updates/releases/7.0.6/2021-06/"/>
           <repository
-              url="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository/"/>
+              url="https://download.eclipse.org/tools/gef/classic/releases/3.15.0/"/>
           <repository
-              url="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/>
+              url="https://download.eclipse.org/tools/orbit/downloads/drops/R20221123021534/repository/"/>
         </repositoryList>
       </targlet>
     </setupTask>
@@ -308,8 +308,6 @@
             name="org.eclipse.uml2.sdk.feature.group"/>
         <requirement
             name="org.junit"/>
-        <requirement
-            name="org.mockito"/>
         <requirement
             name="org.slf4j.api"/>
         <requirement
@@ -324,7 +322,7 @@
           <repository
               url="https://download.eclipse.org/cbi/updates/license/"/>
           <repository
-              url="https://download.eclipse.org/eclipse/updates/4.26-I-builds/I20221123-1800/"/>
+              url="https://download.eclipse.org/eclipse/updates/4.26/R-4.26-202211231800/"/>
           <repository
               url="https://download.eclipse.org/ecp/rt/1270/"/>
           <repository
@@ -340,13 +338,13 @@
           <repository
               url="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202211041032/"/>
           <repository
-              url="https://download.eclipse.org/modeling/mdt/ocl/updates/milestones/6.18.0/S202211211436/"/>
+              url="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.18.0/"/>
           <repository
               url="https://download.eclipse.org/modeling/mdt/uml2/updates/5.5/"/>
           <repository
               url="https://download.eclipse.org/sirius/updates/releases/7.0.6/2021-06/"/>
           <repository
-              url="https://download.eclipse.org/tools/gef/classic/releases/3.15.0RC1/"/>
+              url="https://download.eclipse.org/tools/gef/classic/releases/3.15.0/"/>
           <repository
               url="https://download.eclipse.org/tools/orbit/downloads/drops/R20221123021534/repository/"/>
         </repositoryList>
diff --git a/releng/org.eclipse.passage.target/org.eclipse.passage.baseline.target b/releng/org.eclipse.passage.target/org.eclipse.passage.baseline.target
index 3705f56e5..49b197fa9 100644
--- a/releng/org.eclipse.passage.target/org.eclipse.passage.baseline.target
+++ b/releng/org.eclipse.passage.target/org.eclipse.passage.baseline.target
@@ -12,49 +12,49 @@
 	Contributors:
 		ArSysOp - initial API and implementation
 -->
-<target name="org.eclipse.passage.baseline" sequenceNumber="100">
+<target name="org.eclipse.passage.baseline" sequenceNumber="101">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/cbi/updates/license/"/>
 			<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.24/R-4.24-202206070700/"/>
+			<repository location="https://download.eclipse.org/eclipse/updates/4.26/R-4.26-202211231800/"/>
 			<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
 			<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/ecp/rt/1261/"/>
+			<repository location="https://download.eclipse.org/ecp/rt/1270/"/>
 			<unit id="org.eclipse.emf.ecp.emfforms.runtime.feature.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.emfforms.setup.base" 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.30/"/>
+			<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.32/"/>
 			<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/modeling/emf/query/updates/releases/R201805030653/"/>
+			<repository location="https://download.eclipse.org/modeling/emf/query/updates/releases/R202208101410/"/>
 			<unit id="org.eclipse.emf.query.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/transaction/updates/releases/R201805140824/"/>
+			<repository location="https://download.eclipse.org/modeling/emf/transaction/updates/releases/R202208110935/"/>
 			<unit id="org.eclipse.emf.transaction.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/validation/updates/releases/R202008210805/"/>
+			<repository location="https://download.eclipse.org/modeling/emf/validation/updates/releases/R202208271102/"/>
 			<unit id="org.eclipse.emf.validation.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/gmp/gmf-notation/updates/releases/R202004160913/"/>
+			<repository location="https://download.eclipse.org/modeling/gmp/gmf-notation/updates/releases/R202211151334/"/>
 			<unit id="org.eclipse.gmf.runtime.notation.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/gmp/gmf-runtime/updates/releases/R202106221344/"/>
+			<repository location="https://download.eclipse.org/modeling/gmp/gmf-runtime/updates/releases/R202211041032/"/>
 			<unit id="org.eclipse.gmf.runtime.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/mdt/ocl/updates/releases/6.17.1/"/>
+			<repository location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.18.0/"/>
 			<unit id="org.eclipse.ocl.all.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -62,43 +62,40 @@
 			<unit id="org.eclipse.uml2.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/2.5.0/"/>
+			<repository location="https://download.eclipse.org/passage/updates/release/2.6.0/"/>
 			<unit id="org.eclipse.passage.lbc.execute.feature.feature.group" version="0.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"/>
 			<unit id="org.eclipse.passage.loc.operator.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/sirius/updates/releases/6.5.1/2020-09/"/>
+			<repository location="https://download.eclipse.org/sirius/updates/releases/7.0.6/2021-06/"/>
 			<unit id="org.eclipse.sirius.runtime.aql.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.sirius.runtime.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/gef/updates/legacy/releases/4.0.0_gef-master_1952/"/>
+			<repository location="https://download.eclipse.org/tools/gef/classic/releases/3.15.0/"/>
 			<unit id="org.eclipse.gef.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/tools/orbit/downloads/drops/R20220531185310/repository/"/>
+			<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20221123021534/repository/"/>
 			<unit id="com.fasterxml.jackson.core.jackson-annotations" version="0.0.0"/>
 			<unit id="com.fasterxml.jackson.core.jackson-core" version="0.0.0"/>
 			<unit id="com.fasterxml.jackson.core.jackson-databind" version="0.0.0"/>
 			<unit id="com.github.oshi.oshi-core" version="0.0.0"/>
 			<unit id="com.sun.jna" version="4.5.1.v20210503-0343"/>
-			<unit id="com.sun.jna.platform" version="4.5.1.v20190425-1842"/>
+			<unit id="com.sun.jna.platform" version="4.5.1.v20221112-0806"/>
+			<unit id="jakarta.servlet" version="0.0.0"/>
 			<unit id="javax.activation" version="0.0.0"/>
 			<unit id="org.apache.commons.csv" version="0.0.0"/>
 			<unit id="org.apache.logging.log4j" version="0.0.0"/>
-			<unit id="org.bouncycastle.bcpg" version="1.70.0.v20220507-1208"/>
-			<unit id="org.bouncycastle.bcpkix" version="1.70.0.v20220105-1522"/>
-			<unit id="org.bouncycastle.bcprov" version="1.70.0.v20220507-1208"/>
-			<unit id="org.bouncycastle.bcutil" version="1.70.0.v20220105-1522"/>
+			<unit id="org.bouncycastle.bcpg" version="0.0.0"/>
+			<unit id="org.bouncycastle.bcpkix" version="0.0.0"/>
+			<unit id="org.bouncycastle.bcprov" version="0.0.0"/>
+			<unit id="org.bouncycastle.bcutil" version="0.0.0"/>
 			<unit id="org.junit" version="0.0.0"/>
 			<unit id="org.slf4j.api" version="0.0.0"/>
 			<unit id="org.slf4j.apis.log4j" version="0.0.0"/>
 		</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/>
-			<unit id="javax.servlet" version="0.0.0"/>
-		</location>
 	</locations>
 </target>
diff --git a/releng/org.eclipse.passage.target/org.eclipse.passage.target.target b/releng/org.eclipse.passage.target/org.eclipse.passage.target.target
index bebddd1ec..5408f1f23 100644
--- a/releng/org.eclipse.passage.target/org.eclipse.passage.target.target
+++ b/releng/org.eclipse.passage.target/org.eclipse.passage.target.target
@@ -12,14 +12,14 @@
 	Contributors:
 		ArSysOp - initial API and implementation
 -->
-<target name="org.eclipse.passage.target" sequenceNumber="108">
+<target name="org.eclipse.passage.target" sequenceNumber="109">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/cbi/updates/license/"/>
 			<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.26-I-builds/I20221123-1800/"/>
+			<repository location="https://download.eclipse.org/eclipse/updates/4.26/R-4.26-202211231800/"/>
 			<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
 			<unit id="org.eclipse.sdk.feature.group" version="0.0.0"/>
@@ -54,7 +54,7 @@
 			<unit id="org.eclipse.gmf.runtime.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/mdt/ocl/updates/milestones/6.18.0/S202211211436/"/>
+			<repository location="https://download.eclipse.org/modeling/mdt/ocl/updates/releases/6.18.0/"/>
 			<unit id="org.eclipse.ocl.all.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -67,7 +67,7 @@
 			<unit id="org.eclipse.sirius.runtime.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/gef/classic/releases/3.15.0RC1/"/>
+			<repository location="https://download.eclipse.org/tools/gef/classic/releases/3.15.0/"/>
 			<unit id="org.eclipse.gef.sdk.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">

From 8c686cab20b4b8780e497309c1fab0bba9775b39 Mon Sep 17 00:00:00 2001
From: Alexander Fedorov <alexander.fedorov@arsysop.ru>
Date: Tue, 6 Dec 2022 12:38:18 +0300
Subject: [PATCH 2/2] Prepare releng for 2.6.1 release #1177

Increment version for org.eclipse.passage.lbc.base

Signed-off-by: Alexander Fedorov <alexander.fedorov@arsysop.ru>
---
 bundles/org.eclipse.passage.lbc.base/META-INF/MANIFEST.MF | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundles/org.eclipse.passage.lbc.base/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lbc.base/META-INF/MANIFEST.MF
index d34415cd7..75f6d2825 100644
--- a/bundles/org.eclipse.passage.lbc.base/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.passage.lbc.base/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Automatic-Module-Name: org.eclipse.passage.lbc.base
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.passage.lbc.base
-Bundle-Version: 1.2.300.qualifier
+Bundle-Version: 1.2.301.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright