Merge branch 'v14_ums' into bugfix/m3u_uri_handling

* v14_ums: (41 commits)
  fix episodes with tvseries
  let services sort / localize / split children
  small logic error fix in playlist manager
  yarn cleanup
  Bump @types/react from 18.2.64 to 18.2.78 in /react-client (UniversalMediaServer#4582)
  Bump logback-version from 1.5.3 to 1.5.5 (UniversalMediaServer#4584)
  Bump eslint-plugin-react from 7.33.2 to 7.34.1 in /react-client (UniversalMediaServer#4539)
  Bump @testing-library/react from 14.2.1 to 15.0.2 in /react-client (UniversalMediaServer#4583)
  Bump the typescript-eslint group in /react-client with 2 updates (UniversalMediaServer#4581)
  Bump org.slf4j:slf4j-api from 2.0.12 to 2.0.13 (UniversalMediaServer#4586)
  Merge ums/main into v14
  fix / clean / adapt
  Post-release
  Fixed MKV detection on some renderers (UniversalMediaServer#4577)
  Bump tar from 6.2.0 to 6.2.1 in /react-client in the npm_and_yarn group (UniversalMediaServer#4575)
  parsing file in progress
  matroska -> mkv
  Merge branch 'main' of https://github.com/UniversalMediaServer/UniversalMediaServer into v14
  Fix transcoded video container logic for MP4 and WMV transcoding goals (UniversalMediaServer#4573)
  Bump @types/lodash from 4.14.202 to 4.17.0 in /react-client (UniversalMediaServer#4569)
  ...

.github/workflows/ci.yaml

@@ -270,6 +270,7 @@ jobs:
       - uses: dangoslen/dependabot-changelog-helper@v3
         with:
           activationLabels: 'dependencies'
+          sort: 'alpha'
       - uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: "Update Changelog"

.github/workflows/pull-request-conflict.yaml

@@ -11,11 +11,14 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
+    - name: print user login name
+      id: print-user
+      run: echo 'aa${{ github.event.pull_request.user.login }}aa'
     - name: check if prs are dirty
-      if: ${{ github.event.pull_request.user.login == 'dependabot' }}
+      if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}
       uses: eps1lon/actions-label-merge-conflict@releases/2.x
       id: check
       with:
         dirtyLabel: "conflicting"
         repoToken: "${{ secrets.AUTOMATION_TOKEN }}"
-        commentOnDirty: '@dependabot recreate'
+        commentOnDirty: '@dependabot recreate'

pom.xml

@@ -20,7 +20,7 @@
 	<artifactId>ums</artifactId>
 	<name>Universal Media Server</name>
 	<packaging>jar</packaging>
-	<version>14.0.0-b1</version>
+	<version>14.0.0-b2</version>
 	<url>https://www.universalmediaserver.com/</url>
 	<inceptionYear>2012</inceptionYear>
 
@@ -93,13 +93,13 @@
 
 			Check the org.slf4j:slf4j-api version of the other libraries before upgrading
 		-->
-		<slf4j-api-version>2.0.12</slf4j-api-version>
+		<slf4j-api-version>2.0.13</slf4j-api-version>
 
 		<!--
 			ch.qos.logback:logback-classic and logback-core is shared with
 				- net.pms:ums
 		-->
-		<logback-version>1.5.3</logback-version>
+		<logback-version>1.5.5</logback-version>
 
 		<!--
 			com.fasterxml.jackson.core:logback-classic and logback-core is shared with
@@ -188,7 +188,7 @@
 
 				Check the commons-io:commons-io version of the libraries before upgrading
 			-->
-			<version>2.15.1</version>
+			<version>2.16.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
@@ -553,7 +553,7 @@
 			<!-- Check the org.slf4j:slf4j-api version of the other libraries before upgrading -->
 			<!-- Check the net.java.dev.jna:jna version of the other libraries before upgrading -->
 			<!-- Check the net.java.dev.jna:jna-platform version of the other libraries before upgrading -->
-			<version>6.4.10</version>
+			<version>6.5.0</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.slf4j</groupId>

react-client/package.json

@@ -11,7 +11,7 @@
     "@mantine/modals": "7.5.3",
     "@mantine/notifications": "7.5.3",
     "@microsoft/fetch-event-source": "2.0.1",
-    "axios": "1.6.7",
+    "axios": "1.6.8",
     "jwt-decode": "4.0.0",
     "lodash": "4.17.21",
     "react": "18.2.0",
@@ -20,7 +20,7 @@
     "react-movable": "3.2.0",
     "react-router-dom": "6.22.3",
     "tabler-icons-react": "1.56.0",
-    "typescript": "5.4.3",
+    "typescript": "5.4.4",
     "video.js": "8.10.0",
     "web-vitals": "3.5.2"
   },
@@ -56,17 +56,17 @@
   "devDependencies": {
     "@playwright/test": "^1.42.1",
     "@testing-library/jest-dom": "6.4.2",
-    "@testing-library/react": "14.2.1",
+    "@testing-library/react": "15.0.2",
     "@testing-library/user-event": "14.5.2",
     "@types/jest": "29.5.12",
-    "@types/lodash": "4.14.202",
-    "@types/node": "18.19.24",
-    "@types/react": "18.2.64",
-    "@types/react-dom": "18.2.22",
-    "@typescript-eslint/eslint-plugin": "7.3.1",
-    "@typescript-eslint/parser": "7.3.1",
+    "@types/lodash": "4.17.0",
+    "@types/node": "18.19.28",
+    "@types/react": "18.2.78",
+    "@types/react-dom": "18.2.23",
+    "@typescript-eslint/eslint-plugin": "7.6.0",
+    "@typescript-eslint/parser": "7.6.0",
     "eslint": "8.57.0",
-    "eslint-plugin-react": "7.33.2",
+    "eslint-plugin-react": "7.34.1",
     "react-scripts": "5.0.1"
   }
 }