Merge branch 'v14_ums' into main_v14

* v14_ums:
  ensure BACKGROUND_EXECUTOR is running
  ensure TvSeriesId is set
  Bump axios from 1.6.4 to 1.6.5 in /react-client (UniversalMediaServer#4349)
  Fixed changelog generation not running for React app dependency bumps
  Run changelog script only if tests pass
  Added Unreleased section to changelog
  Added version field to changelog script
  Customize events for changelog script
  Enable more dependabot ecosystems
  Disable automerge while testing changelog automation
  chore(deps): update dependency @types/react to v18.2.47
  Switch actor to dependabot
  Add schedule
  Create dependabot.yml
  Enable the dependency dashboard
  Remove Renovate schedule for testing
  Auto-generate changelog entries for Dependabot/Renovate (UniversalMediaServer#4341)

.github/dependabot.yml

@@ -0,0 +1,19 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/react-client"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/ci.yaml

@@ -254,3 +254,22 @@ jobs:
       - name: Run tests
         run: |
           mvn verify -P linter -DdisableXmlReport=true -DskipTests
+
+  changelog:
+    if: |
+      github.actor == 'dependabot[bot]'
+    needs:
+      - macos-browser
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+      - uses: dangoslen/dependabot-changelog-helper@v3
+        with:
+          activationLabel: 'dependencies'
+      - uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: "Update Changelog"

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## [Unreleased]
+
+### Dependencies
+- Bump `axios` from 1.6.4 to 1.6.5 ([#4349](https://github.com/UniversalMediaServer/UniversalMediaServer/pull/4349))
+
 ## [14.0.0-b1](https://github.com/UniversalMediaServer/UniversalMediaServer/compare/13.8.1...v14) (2023-12-08)
 
 ### General
@@ -42,13 +47,17 @@
 - Improved transcoding support on Samsung OLED TVs
 
 ### Dependencies
+- Updated git-commit-id-maven-plugin to 7.0.0
 - Updated h2database to 2.2.224
+- Updated jakarta.servlet-api to 6.0.0
 - Updated jwt-decode to v4
-- Updated Mantine to v7, which:
+- Updated Mantine to v7.4.0, which:
   - Improves performance of the web interface
   - Improves RTL language support
   - Uses your system light/dark mode preference
 - Updated NSIS to v3
+- Updated nsis-maven-plugin to v1.0.5
+- Updated typescript to 5.3.3
 - Updated yarn to v4, which improves install performance by 3x
 - Updated web-vitals to 3.5.0
 

react-client/package.json

@@ -61,7 +61,7 @@
     "@testing-library/user-event": "14.5.2",
     "@types/jest": "29.5.11",
     "@types/lodash": "4.14.202",
-    "@types/node": "18.19.4",
+    "@types/node": "18.19.5",
     "@types/react": "18.2.47",
     "@types/react-dom": "18.2.18",
     "@typescript-eslint/eslint-plugin": "6.18.0",

react-client/yarn.lock

@@ -1912,11 +1912,9 @@ __metadata:
   linkType: hard
 
 "@floating-ui/utils@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "@floating-ui/utils@npm:0.2.0"
-  peerDependencies:
-    react: ">=16.8.0"
-  checksum: 18a5827e65fb473ae9ec80536da0d05193728e88d921e5d2895e49985bb40df62351d32857da18bc08723a555c0ce251c8a1c5b09ad87c29808c1fb34894380a
+  version: 0.2.1
+  resolution: "@floating-ui/utils@npm:0.2.1"
+  checksum: ee77756712cf5b000c6bacf11992ffb364f3ea2d0d51cc45197a7e646a17aeb86ea4b192c0b42f3fbb29487aee918a565e84f710b8c3645827767f406a6b4cc9
   languageName: node
   linkType: hard
 
@@ -3117,20 +3115,20 @@ __metadata:
   linkType: hard
 
 "@types/node@npm:*":
-  version: 20.10.6
-  resolution: "@types/node@npm:20.10.6"
+  version: 20.10.7
+  resolution: "@types/node@npm:20.10.7"
   dependencies:
     undici-types: "npm:~5.26.4"
-  checksum: 6692ccfa8552ef60c4069fda3c8de726c23e8d403cdf788e3c7efa769987e80fbda5f02723dd857f9de7df24a5fa40b3ed4580ec3c5cbac04eba44cf7b2ab1dc
+  checksum: d626cea1b7da4784ee7b335dcc54e64adba9725dab7ca51a690167de502ef89fec07b05ad8e25845d188d7ad7f72c192ec92964d456321ed5b9452113bf9351f
   languageName: node
   linkType: hard
 
-"@types/node@npm:18.19.4":
-  version: 18.19.4
-  resolution: "@types/node@npm:18.19.4"
+"@types/node@npm:18.19.5":
+  version: 18.19.5
+  resolution: "@types/node@npm:18.19.5"
   dependencies:
     undici-types: "npm:~5.26.4"
-  checksum: e395bf591e79bd91c0819e7bee39c56e881399da2ca37fba5a59194ff28941fb8ed663c3fb4fba89465842720d916110dee9b774a3e4aecbe08b9e1ada4ab4fe
+  checksum: 8ad59db82b08cb34b2e891e2193aad1081db082178e16189857ffff6619180b9dc74cb14f6e0449007c6797cf0a818a3929a7575b9816267b3d1d858f9fa7be1
   languageName: node
   linkType: hard
 
@@ -4591,12 +4589,12 @@ __metadata:
   linkType: hard
 
 "bonjour-service@npm:^1.0.11":
-  version: 1.2.0
-  resolution: "bonjour-service@npm:1.2.0"
+  version: 1.2.1
+  resolution: "bonjour-service@npm:1.2.1"
   dependencies:
     fast-deep-equal: "npm:^3.1.3"
     multicast-dns: "npm:^7.2.5"
-  checksum: f933010d15cc885864678cd1bca5ca615379a039b4420d8af07f97d7cc368bf294db8d3855a35213cba148bb83a704f8c6c92879d5d8536c8aa4f5210284ade0
+  checksum: 953cbfc27fc9e36e6f988012993ab2244817d82426603e0390d4715639031396c932b6657b1aa4ec30dbb5fa903d6b2c7f1be3af7a8ba24165c93e987c849730
   languageName: node
   linkType: hard
 
@@ -4784,9 +4782,9 @@ __metadata:
   linkType: hard
 
 "caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001538, caniuse-lite@npm:^1.0.30001565":
-  version: 1.0.30001574
-  resolution: "caniuse-lite@npm:1.0.30001574"
-  checksum: 27a01d086f5a7300862ea054a9f8b8e155f2cfb83c8223723be0d707e55c653ca5eb1adc196cb28c9aa2ed91d6f87b5372f342c554f1de6769c57a284835b8ed
+  version: 1.0.30001576
+  resolution: "caniuse-lite@npm:1.0.30001576"
+  checksum: 79cf666f9139c542bdf75eab76171534dc638d2f8efacd325649c8ec6be59de400f0e9d6dc02504f12125626b306c0a848fe86904c01722218b2a479be82a9c1
   languageName: node
   linkType: hard
 
@@ -13607,7 +13605,7 @@ __metadata:
     "@testing-library/user-event": "npm:14.5.2"
     "@types/jest": "npm:29.5.11"
     "@types/lodash": "npm:4.14.202"
-    "@types/node": "npm:18.19.4"
+    "@types/node": "npm:18.19.5"
     "@types/react": "npm:18.2.47"
     "@types/react-dom": "npm:18.2.18"
     "@typescript-eslint/eslint-plugin": "npm:6.18.0"

renovate.json

@@ -1,23 +1,17 @@
 {
-  "extends": [
-    "config:base"
-  ],
-  "schedule": ["on friday"],
+  "extends": ["config:recommended", ":dependencyDashboard"],
   "lockFileMaintenance": {
-    "enabled": true,
-    "automerge": true,
-    "automergeType": "branch"
+    "enabled": true
   },
+  "labels": ["dependencies"],
   "packageRules": [
     {
       "matchSourceUrlPrefixes": ["https://github.com/mantinedev/mantine"],
       "groupName": "Mantine monorepo packages"
     },
     {
       "matchUpdateTypes": ["patch"],
-      "matchCurrentVersion": "!/^0/",
-      "automerge": true,
-      "automergeType": "branch"
+      "matchCurrentVersion": "!/^0/"
     }
   ]
 }

src/main/java/net/pms/external/tmdb/TMDB.java

@@ -144,6 +144,11 @@ public static boolean isReady() {
 	}
 
 	private static boolean shouldLookupAndAddMetadata(final File file, final MediaInfo mediaInfo) {
+		if (BACKGROUND_EXECUTOR.isShutdown()) {
+			LOGGER.trace("Not doing background API lookup because background executor is shutdown");
+			return false;
+		}
+
 		if (!CONFIGURATION.getExternalNetwork()) {
 			LOGGER.trace("Not doing background TMDB lookup because external network is disabled");
 			return false;

src/main/java/net/pms/external/umsapi/APIUtils.java

@@ -267,6 +267,11 @@ public static void setApiImageBaseURL() {
 	}
 
 	private static boolean shouldLookupAndAddMetadata() {
+		if (BACKGROUND_EXECUTOR.isShutdown()) {
+			LOGGER.trace("Not doing background API lookup because background executor is shutdown");
+			return false;
+		}
+
 		if (!CONFIGURATION.getExternalNetwork()) {
 			LOGGER.trace("Not doing background API lookup because external network is disabled");
 			return false;
@@ -776,12 +781,13 @@ private static Long setTVSeriesInfo(final Connection connection, String titleFro
 				}
 
 				MediaTableTVSeries.updateAPIMetadata(connection, tvSeriesMetadata, tvSeriesId);
+				tvSeriesMetadata.setTvSeriesId(tvSeriesId);
 			}
 			//update MediaVideoMetadata
 			if (videoMetadata != null) {
 				LOGGER.trace("Setting Episode TvSeriesMetadata {}", tvSeriesMetadata.getTitle());
 				videoMetadata.setSeriesMetadata(tvSeriesMetadata);
-				if (!tvSeriesMetadata.getTvSeriesId().equals(videoMetadata.getTvSeriesId())) {
+				if (tvSeriesMetadata.getTvSeriesId() != null && !tvSeriesMetadata.getTvSeriesId().equals(videoMetadata.getTvSeriesId())) {
 					LOGGER.trace("Replacing Episode TvSeriesId from {} to {}", videoMetadata.getTvSeriesId(), tvSeriesMetadata.getTvSeriesId());
 					videoMetadata.setTvSeriesId(tvSeriesMetadata.getTvSeriesId());
 				}