ST6RI-916 Update pom.xml set-version rewrites for bundle metadata

AxelRICHARD · AxelRICHARD · commit c89e8b9ac60c · 2026-05-04T10:43:48.000+02:00
Update the root set-version antrun step to keep
org.omg.sysml.model.bundle metadata in sync by rewriting the embedded
model JAR path in MANIFEST.MF, build.properties, and .classpath, and
normalize internal org.omg bundle Require-Bundle version pins to the
reactor version.

Signed-off-by: Axel RICHARD &lt;axel.richard@obeo.fr&gt;
diff --git a/org.omg.kerml.expressions.xtext.ui/META-INF/MANIFEST.MF b/org.omg.kerml.expressions.xtext.ui/META-INF/MANIFEST.MF
@@ -19,7 +19,7 @@ Require-Bundle: org.omg.kerml.expressions.xtext,
  org.eclipse.xtext.builder,
  org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
  org.eclipse.xtend.lib;bundle-version="2.14.0";resolution:=optional,
- org.omg.sysml;bundle-version="0.2.0",
+ org.omg.sysml;bundle-version="0.59.0",
  org.eclipse.xtext.common.types.ui
 Import-Package: org.apache.log4j
 Export-Package: org.omg.kerml.expressions.xtext.ui.quickfix,
diff --git a/org.omg.kerml.expressions.xtext/META-INF/MANIFEST.MF b/org.omg.kerml.expressions.xtext/META-INF/MANIFEST.MF
@@ -13,8 +13,8 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.xtext.util,
  org.eclipse.xtend.lib;bundle-version="2.14.0",
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
- org.omg.sysml.model.bundle;bundle-version="0.58.0",
- org.omg.sysml;bundle-version="0.58.0",
+ org.omg.sysml.model.bundle;bundle-version="0.59.0",
+ org.omg.sysml;bundle-version="0.59.0",
  org.eclipse.uml2.uml,
  org.eclipse.uml2.uml.resources,
  org.eclipse.xtext.common.types,
diff --git a/org.omg.kerml.xpect.tests/META-INF/MANIFEST.MF b/org.omg.kerml.xpect.tests/META-INF/MANIFEST.MF
@@ -11,9 +11,9 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.codegen;bundle-version="2.6.0",
  org.eclipse.xtext.xbase;bundle-version="2.9.2",
  org.eclipse.xtext.ui.shared;bundle-version="2.14.0",
- org.omg.sysml;bundle-version="0.2.0",
- org.omg.kerml.xtext;bundle-version="0.2.0",
- org.omg.kerml.xtext.ui;bundle-version="0.2.0",
+ org.omg.sysml;bundle-version="0.59.0",
+ org.omg.kerml.xtext;bundle-version="0.59.0",
+ org.omg.kerml.xtext.ui;bundle-version="0.59.0",
  org.aopalliance;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.omg.kerml.xpect,
diff --git a/org.omg.kerml.xtext.ide/META-INF/MANIFEST.MF b/org.omg.kerml.xtext.ide/META-INF/MANIFEST.MF
@@ -11,6 +11,6 @@ Require-Bundle: org.omg.kerml.xtext,
  org.eclipse.xtext.ide,
  org.eclipse.xtend.lib,
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
- org.omg.kerml.expressions.xtext;bundle-version="0.9.0",
- org.omg.kerml.expressions.xtext.ide;bundle-version="0.9.0"
+ org.omg.kerml.expressions.xtext;bundle-version="0.59.0",
+ org.omg.kerml.expressions.xtext.ide;bundle-version="0.59.0"
 Export-Package: org.omg.kerml.xtext.ide.contentassist.antlr
diff --git a/org.omg.kerml.xtext.ui/META-INF/MANIFEST.MF b/org.omg.kerml.xtext.ui/META-INF/MANIFEST.MF
@@ -19,11 +19,11 @@ Require-Bundle: org.omg.kerml.xtext,
  org.eclipse.xtext.builder,
  org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
  org.eclipse.xtend.lib;bundle-version="2.14.0";resolution:=optional,
- org.omg.sysml.model.bundle;bundle-version="0.58.0",
- org.omg.sysml;bundle-version="0.58.0",
- org.omg.kerml.expressions.xtext;bundle-version="0.9.0",
- org.omg.kerml.expressions.xtext.ide;bundle-version="0.9.0",
- org.omg.kerml.expressions.xtext.ui;bundle-version="0.9.0",
+ org.omg.sysml.model.bundle;bundle-version="0.59.0",
+ org.omg.sysml;bundle-version="0.59.0",
+ org.omg.kerml.expressions.xtext;bundle-version="0.59.0",
+ org.omg.kerml.expressions.xtext.ide;bundle-version="0.59.0",
+ org.omg.kerml.expressions.xtext.ui;bundle-version="0.59.0",
  org.eclipse.xtext.common.types.ui,
  org.eclipse.emf.ecore.editor
 Import-Package: org.apache.log4j
diff --git a/org.omg.kerml.xtext/META-INF/MANIFEST.MF b/org.omg.kerml.xtext/META-INF/MANIFEST.MF
@@ -13,11 +13,11 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.xtext.util,
  org.eclipse.xtend.lib;bundle-version="2.14.0",
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
- org.omg.sysml.model.bundle;bundle-version="0.58.0",
- org.omg.sysml;bundle-version="0.58.0",
+ org.omg.sysml.model.bundle;bundle-version="0.59.0",
+ org.omg.sysml;bundle-version="0.59.0",
  org.eclipse.uml2.uml,
  org.eclipse.uml2.uml.resources,
- org.omg.kerml.expressions.xtext;bundle-version="0.9.0",
+ org.omg.kerml.expressions.xtext;bundle-version="0.59.0",
  com.google.gson,
  org.eclipse.xtext.common.types,
  org.objectweb.asm;bundle-version="9.3.0";resolution:=optional
diff --git a/org.omg.sysml.edit/META-INF/MANIFEST.MF b/org.omg.sysml.edit/META-INF/MANIFEST.MF
@@ -13,5 +13,5 @@ Export-Package: org.omg.sysml.lang.sysml.provider
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.edit;visibility:=reexport,
  org.eclipse.uml2.common.edit;visibility:=reexport,
- org.omg.sysml.model.bundle;bundle-version="0.58.0";visibility:=reexport
+ org.omg.sysml.model.bundle;bundle-version="0.59.0";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/org.omg.sysml.execution/META-INF/MANIFEST.MF b/org.omg.sysml.execution/META-INF/MANIFEST.MF
@@ -8,5 +8,5 @@ Bundle-Name: org.omg.sysml.execution
 Bundle-Vendor: SysML v2 Submission Team
 Bundle-ActivationPolicy: lazy
 Export-Package: org.omg.sysml.execution.expressions
-Require-Bundle: org.omg.sysml.model.bundle;bundle-version="0.58.0",
- org.omg.sysml;bundle-version="0.58.0"
+Require-Bundle: org.omg.sysml.model.bundle;bundle-version="0.59.0",
+ org.omg.sysml;bundle-version="0.59.0"
diff --git a/org.omg.sysml.interactive.tests/META-INF/MANIFEST.MF b/org.omg.sysml.interactive.tests/META-INF/MANIFEST.MF
@@ -6,8 +6,8 @@ Bundle-SymbolicName: org.omg.sysml.interactive.tests;singleton:=true
 Bundle-Version: 0.59.0.qualifier
 Automatic-Module-Name: org.omg.sysml.interactive.tests
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.omg.sysml.interactive;bundle-version="0.3.2",
+Require-Bundle: org.omg.sysml.interactive;bundle-version="0.59.0",
  org.junit;bundle-version="4.12.0",
- org.omg.sysml.model.bundle;bundle-version="0.58.0",
- org.omg.sysml;bundle-version="0.58.0",
+ org.omg.sysml.model.bundle;bundle-version="0.59.0",
+ org.omg.sysml;bundle-version="0.59.0",
  org.eclipse.xtext;bundle-version="2.22.0"
diff --git a/org.omg.sysml.interactive/META-INF/MANIFEST.MF b/org.omg.sysml.interactive/META-INF/MANIFEST.MF
@@ -8,11 +8,11 @@ Export-Package: org.omg.sysml.interactive
 Require-Bundle: org.eclipse.emf.ecore,
  com.google.inject,
  org.eclipse.xtext,
- org.omg.sysml.model.bundle;bundle-version="0.58.0",
- org.omg.sysml;bundle-version="0.58.0",
- org.omg.sysml.execution;bundle-version="0.28.0",
- org.omg.kerml.xtext;bundle-version="0.2.0",
- org.omg.sysml.xtext;bundle-version="0.2.0",
+ org.omg.sysml.model.bundle;bundle-version="0.59.0",
+ org.omg.sysml;bundle-version="0.59.0",
+ org.omg.sysml.execution;bundle-version="0.59.0",
+ org.omg.kerml.xtext;bundle-version="0.59.0",
+ org.omg.sysml.xtext;bundle-version="0.59.0",
  com.google.gson;bundle-version="2.8.6",
  org.eclipse.xtext.common.types
 Import-Package: org.omg.sysml.plantuml
diff --git a/org.omg.sysml.xpect.tests/META-INF/MANIFEST.MF b/org.omg.sysml.xpect.tests/META-INF/MANIFEST.MF
@@ -10,12 +10,12 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.codegen;bundle-version="2.6.0",
  org.eclipse.xtext.xbase;bundle-version="2.9.2",
  org.eclipse.xtext.ui.shared;bundle-version="2.14.0",
- org.omg.sysml;bundle-version="0.2.0",
- org.omg.kerml.xtext;bundle-version="0.2.0",
- org.omg.kerml.xtext.ui;bundle-version="0.2.0",
- org.omg.sysml.xtext;bundle-version="0.2.0",
- org.omg.sysml.xtext.ui;bundle-version="0.2.0",
- org.omg.kerml.xpect.tests;bundle-version="0.9.0"
+ org.omg.sysml;bundle-version="0.59.0",
+ org.omg.kerml.xtext;bundle-version="0.59.0",
+ org.omg.kerml.xtext.ui;bundle-version="0.59.0",
+ org.omg.sysml.xtext;bundle-version="0.59.0",
+ org.omg.sysml.xtext.ui;bundle-version="0.59.0",
+ org.omg.kerml.xpect.tests;bundle-version="0.59.0"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.omg.sysml.xpect.tests
 Bundle-Vendor: SysML v2 Submission Team
diff --git a/org.omg.sysml.xtext.ui/META-INF/MANIFEST.MF b/org.omg.sysml.xtext.ui/META-INF/MANIFEST.MF
@@ -6,8 +6,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-Version: 0.59.0.qualifier
 Bundle-SymbolicName: org.omg.sysml.xtext.ui; singleton:=true
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.omg.sysml.model.bundle;bundle-version="0.58.0",
- org.omg.sysml;bundle-version="0.58.0",
+Require-Bundle: org.omg.sysml.model.bundle;bundle-version="0.59.0",
+ org.omg.sysml;bundle-version="0.59.0",
  org.omg.sysml.xtext,
  org.omg.sysml.xtext.ide,
  org.eclipse.compare,
@@ -19,8 +19,8 @@ Require-Bundle: org.omg.sysml.model.bundle;bundle-version="0.58.0",
  org.eclipse.xtext.ui,
  org.eclipse.xtext.ui.codetemplates.ui,
  org.eclipse.xtext.ui.shared,
- org.omg.kerml.xtext;bundle-version="0.2.0",
- org.omg.kerml.xtext.ui;bundle-version="0.2.0",
+ org.omg.kerml.xtext;bundle-version="0.59.0",
+ org.omg.kerml.xtext.ui;bundle-version="0.59.0",
  org.omg.kerml.expressions.xtext,
  org.omg.kerml.expressions.xtext.ide,
  org.omg.kerml.expressions.xtext.ui,
diff --git a/org.omg.sysml.xtext/META-INF/MANIFEST.MF b/org.omg.sysml.xtext/META-INF/MANIFEST.MF
@@ -14,12 +14,12 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.xtext.util,
  org.eclipse.xtend.lib;bundle-version="2.14.0",
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
- org.omg.sysml.model.bundle;bundle-version="0.58.0",
- org.omg.sysml;bundle-version="0.58.0",
+ org.omg.sysml.model.bundle;bundle-version="0.59.0",
+ org.omg.sysml;bundle-version="0.59.0",
  org.eclipse.uml2.uml,
  org.eclipse.uml2.uml.resources,
- org.omg.kerml.xtext;bundle-version="0.2.0",
- org.omg.kerml.expressions.xtext;bundle-version="0.2.0",
+ org.omg.kerml.xtext;bundle-version="0.59.0",
+ org.omg.kerml.expressions.xtext;bundle-version="0.59.0",
  org.eclipse.xtext.common.types,
  org.objectweb.asm;bundle-version="9.3.0";resolution:=optional,
  org.apache.commons.cli
diff --git a/org.omg.sysml/META-INF/MANIFEST.MF b/org.omg.sysml/META-INF/MANIFEST.MF
@@ -25,7 +25,7 @@ Require-Bundle: org.eclipse.xtext,
  org.eclipse.m2m.qvt.oml,
  org.eclipse.uml2.uml.resources,
  org.eclipse.equinox.common;bundle-version="3.5.0",
- org.omg.sysml.model.bundle;bundle-version="0.58.0"
+ org.omg.sysml.model.bundle;bundle-version="0.59.0"
 Export-Package: org.omg.sysml,
  org.omg.sysml.adapter,
  org.omg.sysml.api,
diff --git a/pom.xml b/pom.xml
@@ -175,6 +175,11 @@
                                regexp="-SNAPSHOT"
                                replace=".qualifier"
                                defaultValue="${maven-version}"/>
+                <propertyregex property="bundle-base-version"
+                               input="${maven-version}"
+                               regexp="-SNAPSHOT"
+                               replace=""
+                               defaultValue="${maven-version}"/>
                 <echo>Set the versions to POM: ${maven-version}, Bundle: ${bundle-version}</echo>
                 <!-- Currently no need to change the versions of child poms but left it for future use.
                 <replaceregexp byline="true" flags="i">
@@ -200,6 +205,23 @@
                   <regexp pattern="&lt;feature([^>]+)(version\s*=\s*&quot;[^&quot;]*&quot;)([^>]+)>"/>
                   <substitution expression="&lt;feature\1version=&quot;${bundle-version}&quot;\3>"/>
                 </replaceregexp>
+                <replaceregexp byline="true" flags="i">
+                  <fileset dir="${basedir}">
+                    <include name="org.omg.sysml.model.bundle/META-INF/MANIFEST.MF"/>
+                    <include name="org.omg.sysml.model.bundle/build.properties"/>
+                    <include name="org.omg.sysml.model.bundle/.classpath"/>
+                  </fileset>
+                  <regexp pattern="lib/org\.omg\.sysml\.model-[^,\s]+\.jar"/>
+                  <substitution expression="lib/org.omg.sysml.model-${maven-version}.jar"/>
+                </replaceregexp>
+                <replaceregexp byline="false" flags="g">
+                  <fileset dir="${basedir}">
+                    <include name="*/META-INF/MANIFEST.MF"/>
+                    <exclude name="org.omg.sysml.uml.ecore.importer*/**/*"/>
+                  </fileset>
+                  <regexp pattern="((?:org\.omg\.sysml|org\.omg\.kerml)[^,;\r\n]*;bundle-version=&quot;)[^&quot;]+(&quot;(?:;[^,\r\n]+)?)"/>
+                  <substitution expression="\1${bundle-base-version}\2"/>
+                </replaceregexp>
               </target>
             </configuration>
             <goals>
