Merge remote-tracking branch 'origin/master' into springboot3

# Conflicts:
#	.gitignore
#	.idea/compiler.xml
#	.idea/misc.xml
#	core/pom.xml
#	core/src/main/java/org/nzbhydra/update/UpdateManager.java
#	core/src/main/resources/changelog.json
#	core/src/main/resources/static/js/nzbhydra.js
#	core/src/main/resources/static/js/nzbhydra.js.map
#	core/src/main/resources/static/js/templates.js
#	core/ui-src/js/directives/hydra-checks-footer.js
#	misc/build-and-release.cmd
#	other/mockserver/pom.xml
#	other/wrapper/pyInstaller/buildWrapper.sh
#	pom.xml
#	releases/linux-release/include/nzbhydra2
#	releases/linux-release/pom.xml
#	releases/pom.xml
#	releases/windows-release/include/NZBHydra2 Console.exe
#	releases/windows-release/include/NZBHydra2.exe
#	releases/windows-release/pom.xml
#	shared/mapping/pom.xml
#	shared/pom.xml
#	tests/pom.xml

changelog.md

@@ -1,3 +1,15 @@
+### v4.7.6 (2022-12-22)
+
+**Feature** The next major update (5.0.0) will require a manual update. I've added logic to handle this and prevent the automatic updates from being executed.
+
+
+
+### v4.7.5
+
+**Fix** Configure separate indexers in lidarr using categories. See <a href="https://github.com/theotherp/nzbhydra2/issues/802">#802</a>
+
+
+
 ### v4.7.4 (2022-12-14)
 
 **Fix** Hopefully make the java update message disappear after a java update. See <a href="https://github.com/theotherp/nzbhydra2/issues/810">#810</a>

core/src/main/java/org/nzbhydra/genericstorage/GenericStorage.java

@@ -42,6 +42,7 @@ public class GenericStorage {
         baseConfigHandler.save(true);
     }
 
+
     public <T> Optional<T> get(String key, Class<T> clazz) {
         if (configProvider.getBaseConfig().getGenericStorage().containsKey(key)) {
             String json = configProvider.getBaseConfig().getGenericStorage().get(key);

core/src/main/java/org/nzbhydra/update/UpdateManager.java

@@ -11,8 +11,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.JavaVersion;
-import org.apache.commons.lang3.SystemUtils;
 import org.nzbhydra.Jackson;
 import org.nzbhydra.NzbHydra;
 import org.nzbhydra.backup.BackupAndRestore;
@@ -163,11 +161,6 @@ public class UpdateManager implements InitializingBean {
                 updateInfo.setBetaVersion(latestVersionWithBeta.getAsString());
             }
         }
-        if (currentVersion.major == 4 && latestVersion.major == 5 && !SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_17)) {
-            logger.info("Update from 4.x to 5.x not supported without Java 17");
-            updateInfo.setUpdateAvailable(false);
-            updateInfo.setBetaUpdateAvailable(false);
-        }
         updateInfo.setPackageInfo(getPackageInfo());
 
         return updateInfo;
@@ -186,7 +179,6 @@ public class UpdateManager implements InitializingBean {
         return DebugInfosProvider.isRunInDocker() || Boolean.parseBoolean(System.getProperty(DISABLE_UPDATE_PROPERTY)) || Boolean.parseBoolean(System.getenv(DISABLE_UPDATE_PROPERTY));
     }
 
-
     private boolean isVersionIgnored(SemanticVersion version) throws UpdateException {
         Optional<UpdateData> updateData = genericStorage.get(KEY, UpdateData.class);
         if (updateData.isPresent() && updateData.get().getIgnoreVersions().contains(version)) {

core/src/main/resources/wrapperHashes2.json

@@ -1,7 +1,7 @@
 {
     "nzbhydra2wrapper.py": "1b1c589959312bc0d93508dd7793a2c15d66c9ab",
-    "nzbhydra2wrapperPy3.py": "9f206b081a5b657e50664b2b74fea806601a7a45",
-    "NZBHydra2.exe": "de671994530c8f93c8025d57cc279dd49f1d294c",
-    "NZBHydra2 Console.exe": "5edc750ce897f9d99c7176f13b9592c506789122",
-    "nzbhydra2": "ddc0263464611e015739d5c3e4688cc9d38c7389"
+    "nzbhydra2wrapperPy3.py": "678f5795c2130b38e45608e650ea08f32b1b9d1d",
+    "NZBHydra2.exe": "83ea6a154bcf07207b41e71bbd1ad91878e97c83",
+    "NZBHydra2 Console.exe": "eb161d5ee8a79988937bd3211dfd936e0d2a35e5",
+    "nzbhydra2": "701630899e7057a981ee21d75d2e048b476f0d7f"
 }

core/ui-src/js/directives/hydra-checks-footer.js

@@ -72,7 +72,7 @@ function hydraChecksFooter() {
                 if (response.data !== "" && response.data) {
                     console.log("Java below 17");
                     //headline, message, params, size, textAlign
-                    ModalService.open("Java version below 17", 'You\'re currently running NZBHydra2 with an older java version. A future update will require Java 17. Please update your system accordingly.', {
+                    ModalService.open("Java version below 17", 'You\'re currently running NZBHydra2 with an older java version. A future update will require Java 17. Please install <a href="https://adoptium.net/" target="_blank">Java 17</a> (not higher) from here.', {
                         yes: {
                             text: "OK"
                         }