(PaisaSlimPkg) Try fix stubborn magician build.

3 files changed, 85 insertions, 43 deletions

diff --git a/src/main/paisa-nonslim/README.txt b/src/main/paisa-nonslim/README.txt
index 5f15e2e..19c25f6 100644
--- a/src/main/paisa-nonslim/README.txt
+++ b/src/main/paisa-nonslim/README.txt
@@ -26,20 +26,8 @@ Evtl für diese services den jssc als "provided" angeben.
 
 TODO awaiting builds again with (hopefully fixed jssc.so):
 
-    `# Build OK` \
-    allitnil, babelfish, barman, benjy, bentstick, captain, colin, hooli,
-    kwaltz, megacamel, minetti, neutron, pobble, prosser, towel, vannharl,
-    vroom, zaphake, poodoo, streetmentioner, thor, zem, heimdall, slarti
-
-    `# Build UNSTABLE` \
-    https://jenkinspaisa-temp.tools.pnet.ch/job/deep/job/SDCISA-15648-RemoveSlimPackaging-n1/ \
-    https://jenkinspaisa-temp.tools.pnet.ch/job/guide/job/SDCISA-15648-RemoveSlimPackaging-n1/ \
-    https://jenkinspaisa-temp.tools.pnet.ch/job/nowwhat/job/SDCISA-15648-RemoveSlimPackaging-n1/ \
-
   && PATH_TO_THE_ONLY_REAL_BROWSER="C:/Users/fankhauseand/.opt/FirefoxPortable-105.0.1/FirefoxPortable.exe" \
   && "${PATH_TO_THE_ONLY_REAL_BROWSER:?}" \
-    `# Build FIRST_RUN` \
-    https://jenkinspaisa-temp.tools.pnet.ch/job/rob/job/SDCISA-15648-RemoveSlimPackaging-n1/ \
     `# Build FAILED` \
     https://jenkinspaisa-temp.tools.pnet.ch/job/blart/job/SDCISA-15648-RemoveSlimPackaging-n1/ \
     https://jenkinspaisa-temp.tools.pnet.ch/job/caveman/job/SDCISA-15648-RemoveSlimPackaging-n1/ \
@@ -47,11 +35,33 @@ TODO awaiting builds again with (hopefully fixed jssc.so):
     https://jenkinspaisa-temp.tools.pnet.ch/job/jeltz/job/SDCISA-15648-RemoveSlimPackaging-n1/ \
     https://jenkinspaisa-temp.tools.pnet.ch/job/loon/job/SDCISA-15648-RemoveSlimPackaging-n1/ \
     https://jenkinspaisa-temp.tools.pnet.ch/job/magician/job/SDCISA-15648-RemoveSlimPackaging-n1/ \
-    https://jenkinspaisa-temp.tools.pnet.ch/job/mown/job/SDCISA-15648-RemoveSlimPackaging-n1/ \
     https://jenkinspaisa-temp.tools.pnet.ch/job/vogon/job/SDCISA-15648-RemoveSlimPackaging-n1/ \
     https://jenkinspaisa-temp.tools.pnet.ch/job/trillian/job/SDCISA-15648-RemoveSlimPackaging-n1/ \
 
-
+blart: error: testInstance seem not to be running
+caveman: error: testInstance seem not to be running
+drdan: error: testInstance seem not to be running
+jeltz: error: vehicleInstance seem not to be running
+loon: error: testInstance seem not to be running
+vogon: error: testInstance seem not to be running
+trillian: error: vehicle2 seem not to be running
+
+
+## Installation
+
+{
+  "timestamp": "2024-08-06T10:09:42.042+02:00",
+  "hostname": "eddie00849",
+  "instanceName": "default",
+  "eaglePort": 7012,
+  "activations": {
+    "SDCISA-15648-1722427419206-legacy": "2024-07-01T00:01:00.000Z",
+    "SDCISA-15648-1722427417010-noslim": "2024-07-01T00:00:00.000Z",
+    "bundle-sw_4011-data_3997": "2024-07-29T11:49:53.152Z",
+    "bundle-sw_4012-data_3997": "2024-07-25T02:00:00.000Z",
+    "bundle-sw_4012-data_4005": "2024-07-16T23:00:00.000Z"
+  }
+}
 
 
 ## Measurements
diff --git a/src/main/paisa-nonslim/foo.js b/src/main/paisa-nonslim/foo.js
index 66921c3..21dcf99 100644
--- a/src/main/paisa-nonslim/foo.js
+++ b/src/main/paisa-nonslim/foo.js
@@ -229,35 +229,27 @@ Related:
          * "poms/service/paisa-service-superpom/pom.xml" as described in
          * SDCISA-15648 */
         var patch = ""
-            +"tVrdb9s2EH/vX8EZ2OrMIZ20HYaw6Zaia4sM3Vo0fdhDgYGSKJk2JQok5dgr+r/vqA9/NHZisrIf"
-            +"IpIif3e8O94HFYwxYuNS5WZsuJ6LmI9LJgzDbQ+bquQa3rs5ZJHLR6PRCEVeK66uEL44Oz89P3+K"
-            +"Rq5xga6uHqGHfpfjTDFpfjtgZqyKVGSVZlao4oAF9aJSK2DUCg4k8EFL3CojRf4SVqUstj4L3Y+p"
-            +"kkkpWBFzutG+/AHjT+//eE9Rwedco0RoHlu5RJXhCRIFKiWzqdI5xp4E4wkplbFEWFLriDApHG1Z"
-            +"66nVVyM8eGh+BPRE5UwUx0IHHcbcmGPBS5VlojiabG55FACtdEaYKcFEprR93nIGhlPbkWaFEVbM"
-            +"eWc/0RKZUrtdNJONtxXtIKjtEY0W3EbKjOUanAeNJTMmZ5bv3d1ERFwXMAPPQbwJs0oH0SwUl0IZ"
-            +"ormxklu6Y4zwhSVOe9Dey880F4VYHIuF3smuDRWo5aogziJp066tE+fcMhAr894PIBgccVZUVkhD"
-            +"74wcQYQ1gVglPKZbvVAgKcGqIagYumMsDDQVklelVCyhd4fCIIWi62YYhGRFRjc7gTCNx6Tf9HsF"
-            +"w6wUvQPSiwtyBtGKG1woi/lCGOtHpAD/YFLCJzGLJ5y2zwAH3wH9lytdTmj77PuwOK++cp1k5Trp"
-            +"Dnf6PcBTNmcLAomWAYFyl/msCUxLhp+Qc3991hGpdOIlE2tLUGepCl5YQ+uuFNDuFTEsSO/Fy0Xu"
-            +"m09sBkUQajwznatuO5gVYLgszDE9hB2QAD0M6mJKJAp/n7cD2GHZZbkN7gbw1Oin52f7c6MJT6SK"
-            +"Z0HnJ3PJSSrMhEAqRxtT59IPp1u1Wu5/HJqVa/3TbweCPCYxVUGgyhHzDnTGtGUbQyFcOqU5pQPc"
-            +"IgrnaxsmzDzv4oi89NSes4JppIwhXWype11kOWrS6mgbmT6b0mkssYIsHNfd46Xm9W7rcEObh6cF"
-            +"qIRhC76PrlpBkXHqDrgUcOLaxjFy8UypTHLiskeSgoVEVWaocyZnv/iBCUUyYSdVVMdCDEoHHgHJ"
-            +"eCalG+quJLZqt7J70XEbuVojdk+gWv8NrVf3AwYF/65A2mjXtRkoX8XCLo+RLO2guZfMjsItgKYC"
-            +"WuqIBV97MwHJb1vuhSfY94C6ehlcUz+YZgmRP8cG4lpl+uUTylwt4p4wQUkaa55B0qtDQ/Au3Dmf"
-            +"iFiCYRUzXKrb/uQ6YZon4JzmIuuT3w1AOJl9IrtrRSgo3AUqVpEzskD0tV+t/wYC1FdsqWY5v1V6"
-            +"RrsrN1U+dCsHmWM+j8OC/x6izT1fb3juvmb/Xc16G33uIVag3EVAEXc/nvs4USrdJ25IONwDxhcl"
-            +"BAvjnVnfA2m57zXGPWCg4z6xwOxDKog2YXYlybr5XXcIXdZAH0wfeB7xJAFHOc0X1k0ITKGbxaSD"
-            +"o3dwg/fSXm2trrhKpeSTI+7HpeROL7Gu8siQrpymq7q60XfPoGGXalElZY2bg56TJV03A8/xVCso"
-            +"Hmnz8C8x7ERV2cS6Y2HIAjIFznLaPj0+SY6/+SY5Onjl9sI7QAeS9/6QemlUpWPuYWlQmIPXrh0A"
-            +"KaCgchfm5OdH+HCED8xOkNvfOxHV7Rf1kCEZt0PYwRRCJhiIkAlp6mWll2iEBmMoL8eDk+eHU9og"
-            +"Qqx6A5wOT0g+A1QzdDiHIyU8RVsqAabXwiZbr8DPSmGHg8+fzciLXXc8rSyGg7daVSUFQN7QsgpF"
-            +"HN28u/4rBw+FBiCNLYonPjQa+bIVtxycFfqCWIrwT5n1YLeTy4wvQRosJZlj+zpxuqKORxjqyFx7"
-            +"Xi3WokiHg3bPv6Mf8a9nZnDqiHns1v1Eiobb+nEZCKSsZujATtAXP7wVe05TCNdCQ0tugAq3yMRg"
-            +"FE5hj0HScwEO/TFiRQJOplyiP19+dK8s02DqtTmfDDx3434g14bMCzToqAz8Yeqz5/h6o1XeaLA+"
-            +"zFa5N0Mfy70D+UkB4Obxg2xKyTkfdkQKcPchFMbjTvYd58DvjXWBbXjiLK/TiDPAhpONCQHCdl7D"
-            +"mUy5XFE8bYFP0Y0F3TKdvIL++9JlP+Tj6w/vXr56/e/rf65vPl3//dZ3k18Rl4b3YpSF8rWur4dP"
-            +"P3AqRLI2whwUC7t4BDsB9lUJVvTsyfM1yAH0fP4D6XLMFzyuHpi5MQvi6v9prRgj"
+            +"tVlLc+MoEL7nV2jPGUgyu1s1oaamslV7n8v+AYTaEgqvAuTY8+u30cN2EjuxGEkH87D6a6CbfokQ"
+            +"UvA7Z3W4C+C3UsCd4zJwMo5I6Bx4/D+9Q3da3dze3hblLIqnp4I83j98+fatuO3b4unppvjs+X5X"
+            +"W67CjyveFNZsZN15HqU1VxD0RM5bXGeUgCzIVSSJKiip/0GqDRdxDmF6uHVcKcmNAHbS//4HIf/9"
+            +"/PcnKwxswReV9CCi2hddgKqQpnCKx431mpCZDEVDnQ2Rykh7EVGuZOKtejGN4hoODxsPK6BXVnNp"
+            +"1kJHGQoIYS14ZetamtXO5gXKDGjra8qDQxVp2di+AEfF6fXIcxNklFuY9KfcF8H5tIvh5TBbi84w"
+            +"9HFFpUWrseEhgkfbwYTiIWge4eLuGlmCN/gG2eLxVjxan8XTWFDSBuohRAWRnZmjsIs0SQ/7F9fT"
+            +"amnkbq0lLM72qKjITVtDk0ayod9rJ9EQOR4rn70fRAikBG66KFVg72ZWOMKegbAVCPZqlAukFGo1"
+            +"OpXAzszlgW6kgs4pyyv2fioPUlp27OZBKG5qdjrIhBksJnszXhSMcCcXB2SPj/QevRUEYmwksJMh"
+            +"zmNi0D6EDYVGcNEAG9sMAz8B/dLWu4aN7dKXJVn1g+mkB9PJzpjT3wFu+ZbvKAZaAQ8UUuRzZNA6"
+            +"Tr7Sh/ny7D2SS8dLmxgditNZAyYG1g+VxP6iiHlO+iKelnpuPHHqFPFQxXOYTPU4INyg4vI8w/QZ"
+            +"dkYA9Dlo8imlNPNt3hnghBX37jV4miBt8H8+3F+OjRqolBXPWfenTsHJRoaGYijHBlUHNQ9nojqQ"
+            +"z78OA+VR/uztRJbFpKEzFLMcuZ1An7mP/GQqZ5VJaEnoCLcr89f1GiZPPd/jSO1mSi9pQVvaEOjk"
+            +"W/rR5FlWDVoT76A2f7WsFYpYjMJJP1wvNO9327sbNjQzNcBWnES0fezQy/KMbbrgSuKNGztrxOK1"
+            +"tbUCmqJHukENKbs6sGRM7v+eByYtrWVsurL3hQSFjmtEpDAzKD0Rd6dItOeFvYiMR881KnFqkWv/"
+            +"m5uvXgbMcv5TgnTS73MzFL4VMu7XCJbO8LzI5kzilsHTIi+7YsI3ViYw+B3TvfwA+wPQlC+jaVoG"
+            +"M+zR82sS0K91Ydl1YprrpVgIE4XkiYcag16f64LP4W6hkUKhYpln4uzLcufacA8VGqetrJdc7wkg"
+            +"3swlkVNZEROKVEAltkxKlol+tKv9byZAX2LbeK7hxfpnNpXcrPusKoeRo96KPOd/gelQ51sML9Vr"
+            +"LtdqjttYcg/ConB3GUncx3jp24SzfkncHHd4AQx2Dp1FmB1ZfwAZYW4Z4wMwlPGSWKj2ORnEGDCn"
+            +"lOTY/a0awhQ1sE/DB9AlVBUaylbvYnohM4QeiOkEx97hZu9lLG0dSlzOWvV1xf2kkDzJRfhOl4FO"
+            +"6TQ75NWDvBcGzSuqlZ1SPa5GOVd7duxm3uPWW0we2dDMTzFiY7u6ielaBLrDSAG4ZmM745Pk3Ztv"
+            +"krdXU+YSpueDtOb6Bbxd+pVUp59uryMJtvMCftzg8z+0uZx1"
         ;
         patch = Buffer.from(patch, 'base64');
         patch = zlib.inflateRaw(patch, function( ex, patch ){
diff --git a/src/main/paisa-nonslim/patches/magician.patch b/src/main/paisa-nonslim/patches/magician.patch
index 78164eb..eb72052 100644
--- a/src/main/paisa-nonslim/patches/magician.patch
+++ b/src/main/paisa-nonslim/patches/magician.patch
@@ -16,3 +16,43 @@
 +                    platform: [version: '${j21.platform.version}'],
                      storage:  [version: '00.24.00.00'],
 
+
+--- a/magician-process/pom.xml
++++ b/magician-process/pom.xml
+@@ -43,4 +43,9 @@
+             <artifactId>system-diagnostics-api</artifactId>
+         </dependency>
++
++        <dependency>
++            <groupId>commons-fileupload</groupId>
++            <artifactId>commons-fileupload</artifactId>
++        </dependency>
+     </dependencies>
+ 
+
+
+--- a/pom.xml
++++ b/pom.xml
+@@ -42,5 +42,6 @@
+         <font-awesome.version>5.9.0</font-awesome.version>
+         <google-http-client.version>1.23.0</google-http-client.version>
++        <common-fileupload.version>1.5</common-fileupload.version>
+         <jersey.version>2.27</jersey.version>
+         <javax.ws.rs-api.version>2.1</javax.ws.rs-api.version>
+     </properties>
+@@ -89,4 +90,10 @@
+             </dependency>
+ 
++            <dependency>
++                <groupId>commons-fileupload</groupId>
++                <artifactId>commons-fileupload</artifactId>
++                <version>${common-fileupload.version}</version>
++            </dependency>
++
+             <!-- Testing -->
+             <dependency>
+
+
+
+
+