Merge pull request #57318 from zmarano/usrmerge-thingsboard

usrmerge /lib - thingsboard version bump

Author: xnox

thingsboard.yaml

@@ -1,10 +1,14 @@
 package:
   name: thingsboard
   version: "4.0.1"
-  epoch: 8
+  epoch: 50
   description: "Open-source IoT Platform - Device management, data collection, processing and visualization."
   copyright:
     - license: Apache-2.0
+  dependencies:
+    runtime:
+      - merged-lib
+      - wolfi-baselayout
 
 environment:
   contents:
@@ -49,7 +53,9 @@ subpackages:
     description: "Executes user-defined JavaScript functions in isolation for the ThingsBoard rule engine."
     dependencies:
       runtime:
+        - merged-lib
         - nodejs-20
+        - wolfi-baselayout
     pipeline:
       - name: Move tb-js-executor to target directories
         runs: |
@@ -93,16 +99,21 @@ subpackages:
     description: Handles MQTT-based device communication and API requests for ThingsBoard.
     dependencies:
       runtime:
+        - merged-lib
         - openjdk-17-default-jvm
+        - wolfi-baselayout
     pipeline:
       - name: Extract tb-mqtt-transport to target directories
         runs: |
+          mkdir -p ${{targets.subpkgdir}}/usr/lib
           mkdir -p ${{targets.subpkgdir}}/usr/bin
           cd msa/transport/mqtt/target
           dpkg-deb -x tb-mqtt-transport.deb ${{targets.subpkgdir}}
           cp start-tb-mqtt-transport.sh ${{targets.subpkgdir}}/usr/bin
           mkdir -p ${{targets.subpkgdir}}/config
           cp ${{targets.subpkgdir}}/usr/share/tb-mqtt-transport/conf/* ${{targets.subpkgdir}}/config
+          mv ${{targets.subpkgdir}}/lib/* ${{targets.subpkgdir}}/usr/lib
+          rmdir ${{targets.subpkgdir}}/lib
     test:
       pipeline:
         - name: Test mqtt-transport server logs
@@ -120,25 +131,30 @@ subpackages:
         - eudev
         - fontconfig
         - lcms2
+        - merged-lib
         - openjdk-17-default-jvm
         - ttf-dejavu
+        - wolfi-baselayout
     pipeline:
       - name: Extract tb-node to target directories
         runs: |
+          mkdir -p ${{targets.subpkgdir}}/usr/lib
           mkdir -p ${{targets.subpkgdir}}/usr/bin
           cd msa/tb-node/target
           dpkg-deb -x thingsboard.deb ${{targets.subpkgdir}}
           cp start-tb-node.sh ${{targets.subpkgdir}}/usr/bin
           mkdir -p ${{targets.subpkgdir}}/config
           cp -r ${{targets.subpkgdir}}/usr/share/thingsboard/conf/* ${{targets.subpkgdir}}/config
+          mv ${{targets.subpkgdir}}/lib/* ${{targets.subpkgdir}}/usr/lib
+          rmdir ${{targets.subpkgdir}}/lib
     test:
       pipeline:
         # This test needs to be run in order to ensure that tomcat-embed-core exists to provide jakarta/servlet/Filter.class (issue with pombump before)
         - name: Test for tomcat-embed-core
           runs: |
             cd /usr/share/thingsboard/bin/
             unzip thingsboard.jar
-            ls BOOT-INF/usr/lib/ | grep -q "tomcat-embed-core" || { echo "tomcat-embed-core not found"; exit 1; }
+            ls BOOT-INF/lib/ | grep -q "tomcat-embed-core" || { echo "tomcat-embed-core not found"; exit 1; }
         - name: Test server logs
           uses: test/daemon-check-output
           with:
@@ -153,7 +169,9 @@ subpackages:
     description: "Hosts static web UI content using a lightweight Express.js component"
     dependencies:
       runtime:
+        - merged-lib
         - nodejs-20
+        - wolfi-baselayout
     pipeline:
       - name: Move tb-web-ui to target directories
         runs: |