Merge pull request #867 from IETS3/merge/mps20223

Merge maintenance/mps20223 into master
IETS3 · Mar 21, 2024 · e861958 · e861958
2 parents 3e80f80 + 2659e7e
commit e861958
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -86,12 +86,10 @@ if (project.hasProperty('iets3OpenSourceVersion')) {
         def buildNumber = System.env.BUILD_NUMBER.toInteger()
         if (currentBranch.startsWith("maintenance-")) {
             version = "$major.$minor.$buildNumber.${GitBasedVersioning.gitShortCommitHash}"
-        } else if (currentBranch.startsWith("datev-loon-staging-") || currentBranch.startsWith("datev-steuer-staging-")){
-            // branch name will be part of the version
-            version = GitBasedVersioning.getVersionWithCount(major, minor, buildNumber)
         } else {
-            version = GitBasedVersioning.getVersionWithCount(major, minor, buildNumber) + "-SNAPSHOT"
-        }
+            def isSnapshot = !(currentBranch.equals("master") || currentBranch.startsWith("datev-loon-staging-") || currentBranch.startsWith("datev-steuer-staging-"))
+            version = GitBasedVersioning.getVersionWithCount(major, minor, buildNumber) + (isSnapshot ? "-SNAPSHOT" : "")
+        } 
         println "##teamcity[buildNumber '${version}']"
     } else {
         version = "$major.$minor-SNAPSHOT"

diff --git a/...guages/org.iets3.opensource/solutions/test.org.iets3.core.comments/models/[email protected] b/...guages/org.iets3.opensource/solutions/test.org.iets3.core.comments/models/[email protected]
@@ -41,7 +41,9 @@
       <concept id="2557074442922380897" name="de.slisson.mps.richtext.structure.Text" flags="ng" index="19SGf9">
         <child id="2557074442922392302" name="words" index="19SJt6" />
       </concept>
-      <concept id="2557074442922438156" name="de.slisson.mps.richtext.structure.Word" flags="ng" index="19SUe$" />
+      <concept id="2557074442922438156" name="de.slisson.mps.richtext.structure.Word" flags="ng" index="19SUe$">
+        <property id="2557074442922438158" name="escapedValue" index="19SUeA" />
+      </concept>
     </language>
     <language id="d4280a54-f6df-4383-aa41-d1b2bffa7eb1" name="com.mbeddr.core.base">
       <concept id="8375407818529178006" name="com.mbeddr.core.base.structure.TextBlock" flags="ng" index="OjmMv">
@@ -128,7 +130,9 @@
           <node concept="1z9TsT" id="12ACZ2oN$_u" role="lGtFl">
             <node concept="OjmMv" id="12ACZ2oN$_v" role="1w35rA">
               <node concept="19SGf9" id="12ACZ2oN$_w" role="OjmMu">
-                <node concept="19SUe$" id="12ACZ2oN$_x" role="19SJt6" />
+                <node concept="19SUe$" id="12ACZ2oN$_x" role="19SJt6">
+                  <property role="19SUeA" value=" " />
+                </node>
               </node>
             </node>
           </node>
@@ -197,7 +201,9 @@
               <node concept="1z9TsT" id="12ACZ2oN$L7" role="lGtFl">
                 <node concept="OjmMv" id="12ACZ2oN$L8" role="1w35rA">
                   <node concept="19SGf9" id="12ACZ2oN$L9" role="OjmMu">
-                    <node concept="19SUe$" id="12ACZ2oN$La" role="19SJt6" />
+                    <node concept="19SUe$" id="12ACZ2oN$La" role="19SJt6">
+                      <property role="19SUeA" value=" " />
+                    </node>
                   </node>
                 </node>
               </node>
@@ -262,7 +268,9 @@
             <node concept="1z9TsT" id="12ACZ2oN$Wx" role="lGtFl">
               <node concept="OjmMv" id="12ACZ2oN$Wy" role="1w35rA">
                 <node concept="19SGf9" id="12ACZ2oN$Wz" role="OjmMu">
-                  <node concept="19SUe$" id="12ACZ2oN$W$" role="19SJt6" />
+                  <node concept="19SUe$" id="12ACZ2oN$W$" role="19SJt6">
+                    <property role="19SUeA" value=" " />
+                  </node>
                 </node>
               </node>
             </node>