PaISA NoSlim fixes.

5 files changed, 48 insertions, 50 deletions

diff --git a/src/main/paisa-nonslim/README.txt b/src/main/paisa-nonslim/README.txt
index a25ad9e..21cf57a 100644
--- a/src/main/paisa-nonslim/README.txt
+++ b/src/main/paisa-nonslim/README.txt
@@ -7,13 +7,6 @@ Currently working on "SDCISA-15648".
 [j21 migration branches sandro](https://wikit.post.ch/display/ISA/ISA+Java21+Update)
 
 
-
-git d -w $(git mb origin/develop origin/SDCISA-15636-Migrate-to-Java-21) origin/SDCISA-15636-Migrate-to-Java-21
-
-
-git d -w $(git mb origin/develop origin/SDCISA-15636-Migrate-to-Java-21-test) origin/SDCISA-15636-Migrate-to-Java-21-test --name-status
-
-
   DSTDIR=/tmp
   tar czf "${DSTDIR:?}"/andy-noslim-$(date -u +%Y%m%d-%H%M%S).tgz -- conf isa-launch-* isa.sh logs preflux prefluxer-* puppetconfig_version repo
 
@@ -24,8 +17,6 @@ jssc sollte hier drin sein -> "alice-docker-service-base*.jar"
 
 Evtl für diese services den jssc als "provided" angeben.
 
-TODO awaiting builds again with (hopefully fixed jssc.so):
-
   && PATH_TO_THE_ONLY_REAL_BROWSER="C:/Users/fankhauseand/.opt/FirefoxPortable-105.0.1/FirefoxPortable.exe" \
 
   && "${PATH_TO_THE_ONLY_REAL_BROWSER:?}" \
diff --git a/src/main/paisa-nonslim/foo.js b/src/main/paisa-nonslim/foo.js
index 7643129..2dd1847 100644
--- a/src/main/paisa-nonslim/foo.js
+++ b/src/main/paisa-nonslim/foo.js
@@ -184,7 +184,8 @@ Related:
         var patchAsStr;
         var mangledPlatformVersion, mangledServiceVersion, mangledSlartiVersion;
         var propsToReplace = [ "j21.service.mangledVersion", "j21.platform.version",
-            "j21.captain.mangledVersion", "j21.slarti.mangledVersion", "j21.megacamel.mangledVersion" ];
+            "j21.captain.mangledVersion", "j21.slarti.mangledVersion", "j21.megacamel.mangledVersion",
+            "j21.guide.mangledVersion", "j21.trillian.mangledVersion", ];
         var propValsByKey = {};
         fs.readFile(path, 'utf8', TODO_sBECAHhRAgCcPAIA);
         function TODO_sBECAHhRAgCcPAIA( ex, patchAsStr_ ){
@@ -201,9 +202,9 @@ Related:
             if( !k ){ replaceProperties(); return; }
             if( !new RegExp("\\${"+ k +"}").test(patchAsStr) ){ getNextProperty(); return; }
             var subj = false ? null
-                : (k == "j21.service.mangledVersion") ? thingyName
-                : (k == "j21.megacamel.mangledVersion") ? thingyName
                 : (k == "j21.platform.version") ? "platform"
+                : (k == "j21.guide.mangledVersion") ? "guide"
+                : (k == "j21.megacamel.mangledVersion") ? "megacamel"
                 : null;
             if( !subj ){ subj = /^j21.([^.]+).mangledVersion$/.exec(k)[1]; }
             if( !subj ){ onDone(Error("TODO_NkICAG1HAgCDYgIA "+ k)); return; }
@@ -319,11 +320,14 @@ Related:
             rsp.on("end", TODO_MRYCAOIzAgAKFQIA);
         }
         function TODO_MRYCAOIzAgAKFQIA(){
-            var pat = new RegExp('\n<a href="('+ app.versionPrefix +'[A-Za-z0-9]+-SNAPSHOT)/">[^<]+</a> +([0-9]{2})-([A-Za-z]{3})-([0-9]{4}) ([0-9]{2}):([0-9]{2}) +-', "g");
+            var pat = new RegExp('\n<a href="('+ app.versionPrefix +'.+-SNAPSHOT)/">[^<]+</a> +([0-9]{2})-([A-Za-z]{3})-([0-9]{4}) ([0-9]{2}):([0-9]{2}) +-', "g");
             var latestVersion, latestDate;
             rspBody.replace(pat, function( match, version, day, mthShrt, yr, hrs, mins, off, rspBody, groupNameMap ){
                 /* [FUCK those FUCKING DAMN bullshit formats!!!](https://xkcd.com/1179/) */
-                var mth = (mthShrt == "Jul") ? "07" : null;
+                var mth = false ? null
+                    : (mthShrt == "Jul") ? "07"
+                    : (mthShrt == "Sep") ? "09"
+                    : null;
                 if( !mth ){ throw Error("TODO_1iUCAA1ZAgBALgIA "+ mthShrt); }
                 var builtAt = yr +"-"+ mth +"-"+ day +" "+ hrs +":"+ mins;
                 if( latestVersion == null || builtAt > latestDate ){
@@ -1197,10 +1201,10 @@ Related:
             issueKey: "SDCISA-15648",
             branchName: null,
             commitMsg: null,
-            versionPrefix: "U0RdSVNB", /* const part of generated seq above (MUST have for find version later) */
-            /* generate: {printf '%s-SNAPSHOT\n' "$(dev-urandom -c 42|base64|tr -d '/+='|head -c8)"} */
-            platformSnapVersion: "ol4AAD0s-SNAPSHOT",
-            serviceSnapVersion: "ol4AAD0s-SNAPSHOT",
+            versionPrefix: "0.0.0-U0RdSV", /* const part of generated seq above (MUST have for find version later) */
+            /* generate: {date +%N|md5sum -b -|base64|tr -d '/+='|head -c6 && echo} */
+            platformSnapVersion: "pikAAO-SNAPSHOT",
+            serviceSnapVersion: "pikAAO-SNAPSHOT",
         };
         app.branchName = app.issueKey +"-RemoveSlimPackaging-n2";
         app.commitMsg = "["+ app.issueKey +"] Remove slim packaging";
diff --git a/src/main/paisa-nonslim/patches/deep.patch b/src/main/paisa-nonslim/patches/deep.patch
index 5982776..1f8b922 100644
--- a/src/main/paisa-nonslim/patches/deep.patch
+++ b/src/main/paisa-nonslim/patches/deep.patch
@@ -12,11 +12,11 @@
                          storage:  [version: '00.24.00.00'],
                          deep:     [version: '%currentBranch%'],
 -                        slarti:   [version: '03.15.12.01-PR-1019-SNAPSHOT'],
-+                        slarti:   [version: '${j21.service.mangledVersion}'],
++                        slarti:   [version: '${j21.slarti.mangledVersion}'],
 -                        guide:    [version: '02.14.13.01-PR-122-SNAPSHOT'],
-+                        guide:    [version: '${j21.service.mangledVersion}'],
++                        guide:    [version: '${j21.guide.mangledVersion}'],
 -                        trillian: [version: '03.00.38.01-PR-413-SNAPSHOT']
-+                        trillian: [version: '${j21.service.mangledVersion}']
++                        trillian: [version: '${j21.trillian.mangledVersion}']
                      ]
                  ]
 
diff --git a/src/main/paisa-nonslim/patches/minetti.patch b/src/main/paisa-nonslim/patches/minetti.patch
index 5f2b05b..c49fba1 100644
--- a/src/main/paisa-nonslim/patches/minetti.patch
+++ b/src/main/paisa-nonslim/patches/minetti.patch
@@ -15,7 +15,8 @@
 @@ -20,16 +20,16 @@
                              backendInstance: [
                                      services: [
-                                             houston:  [version: '02.01.66.01-PR-519-SNAPSHOT'],
+-                                            houston:  [version: '02.01.66.01-PR-519-SNAPSHOT'],
++                                            houston:  [version: '02.01.76.00'],
 -                                            platform: [version: '03.06.40.01-PR-388-SNAPSHOT'],
 +                                            platform: [version: '${j21.platform.version}'],
                                              storage:  [version: '00.24.00.00']
@@ -23,11 +24,13 @@
                              ],
                              vehicleInstance: [
                                      services: [
-                                             eagle:    [version: '02.01.26.01-PR-379-SNAPSHOT'],
+-                                            eagle:    [version: '02.01.26.01-PR-379-SNAPSHOT'],
++                                            eagle:    [version: '02.01.27.00'],
 -                                            platform: [version: '03.06.40.01-PR-388-SNAPSHOT'],
 +                                            platform: [version: '${j21.platform.version}'],
                                              storage:  [version: '00.24.00.00'],
-                                             slarti:   [version: '03.15.09.01-PR-1019-SNAPSHOT'],
+-                                            slarti:   [version: '03.15.09.01-PR-1019-SNAPSHOT'],
++                                            slarti:   [version: '${j21.slarti.mangledVersion}'],
                                              minetti:  [version: '%currentBranch%']
                                      ],
                                      houstonInstance: 'backendInstance'
diff --git a/src/main/paisa-nonslim/patches/rob.patch b/src/main/paisa-nonslim/patches/rob.patch
index 4d3472b..1b8584a 100644
--- a/src/main/paisa-nonslim/patches/rob.patch
+++ b/src/main/paisa-nonslim/patches/rob.patch
@@ -33,13 +33,13 @@
                                              'data-nova': [version: '14.183.0.20240731-1209.P.P.9238.0'],
 
 
---- a/Jenkinsfile
-+++ b/Jenkinsfile
-@@ -47,3 +47,3 @@ serviceBuildPipeline([
-             .saveArtifacts()
--            .executeSonar([failOnQualityGateFailure: true])
-+            // TODO:  .executeSonar([failOnQualityGateFailure: true])
- }
+  OBSOLETE?  --- a/Jenkinsfile
+  OBSOLETE?  +++ b/Jenkinsfile
+  OBSOLETE?  @@ -47,3 +47,3 @@ serviceBuildPipeline([
+  OBSOLETE?               .saveArtifacts()
+  OBSOLETE?  -            .executeSonar([failOnQualityGateFailure: true])
+  OBSOLETE?  +            // TODO:  .executeSonar([failOnQualityGateFailure: true])
+  OBSOLETE?   }
 
 
 --- a/pom.xml
@@ -55,25 +55,25 @@
  
 
 
---- a/pom.xml
-+++ a/pom.xml
-@@ -285,6 +285,16 @@
-                 <artifactId>linti</artifactId>
-                 <version>${linti.version}</version>
-             </dependency>
-+            <dependency>
-+                <groupId>org.glassfish</groupId>
-+                <artifactId>jakarta.el</artifactId>
-+                <version>4.0.2</version> <!-- TODO move this version somewhere else -->
-+            </dependency>
-+            <dependency>
-+                <groupId>org.eclipse.jetty.ee10</groupId>
-+                <artifactId>jetty-ee10-webapp</artifactId>
-+                <version>12.0.12</version> <!-- TODO move this version somewhere else -->
-+            </dependency>
-         </dependencies>
-     </dependencyManagement>
-     <properties>
+  OBSOLETE?  --- a/pom.xml
+  OBSOLETE?  +++ a/pom.xml
+  OBSOLETE?  @@ -285,6 +285,16 @@
+  OBSOLETE?                   <artifactId>linti</artifactId>
+  OBSOLETE?                   <version>${linti.version}</version>
+  OBSOLETE?               </dependency>
+  OBSOLETE?  +            <dependency>
+  OBSOLETE?  +                <groupId>org.glassfish</groupId>
+  OBSOLETE?  +                <artifactId>jakarta.el</artifactId>
+  OBSOLETE?  +                <version>4.0.2</version> <!-- TODO move this version somewhere else -->
+  OBSOLETE?  +            </dependency>
+  OBSOLETE?  +            <dependency>
+  OBSOLETE?  +                <groupId>org.eclipse.jetty.ee10</groupId>
+  OBSOLETE?  +                <artifactId>jetty-ee10-webapp</artifactId>
+  OBSOLETE?  +                <version>12.0.12</version> <!-- TODO move this version somewhere else -->
+  OBSOLETE?  +            </dependency>
+  OBSOLETE?           </dependencies>
+  OBSOLETE?       </dependencyManagement>
+  OBSOLETE?       <properties>
 
 
 --- a/pom.xml