Merge branch 'main' into fix_mask_token

2026-07-09 23:14:04 +02:00 · 2026-07-09 11:05:49 +02:00 · 2026-07-04 14:28:23 +02:00 · 2026-06-27 08:32:08 +02:00 · 2026-06-27 08:30:47 +02:00
2 changed files with 12 additions and 18 deletions
@@ -843,8 +843,10 @@ public class AdminSettingsController {
            return true;
        }

-        // Check for fields containing 'password' or 'secret'
-        return lowerField.contains("password") || lowerField.contains("secret");
+        // Check for fields containing 'password' or 'secret' or 'bottoken'
+        return lowerField.contains("password")
+                || lowerField.contains("secret")
+                || lowerField.contains("bottoken");
    }

    /** Create a masked representation for sensitive fields */
@@ -47,15 +47,11 @@ ext {
    modernJavaVersion = 25
 }

-def buildJavaMajorVersion = (project.findProperty('javaVersion') ?: ext.modernJavaVersion).toString().toInteger()
-def buildJavaLanguageVersion = JavaLanguageVersion.of(buildJavaMajorVersion)
-def buildJavaVersion = JavaVersion.toVersion(buildJavaMajorVersion.toString())
-
 java {
-    sourceCompatibility = buildJavaVersion
-    targetCompatibility = buildJavaVersion
+    sourceCompatibility = JavaVersion.VERSION_25
+    targetCompatibility = JavaVersion.VERSION_25
    toolchain {
-        languageVersion = buildJavaLanguageVersion
+        languageVersion = JavaLanguageVersion.of(project.findProperty('javaVersion')?.toString() ?: '25')
    }
 }

@@ -175,10 +171,10 @@ subprojects {
    apply plugin: 'jacoco'

    java {
-        sourceCompatibility = buildJavaVersion
-        targetCompatibility = buildJavaVersion
+        sourceCompatibility = JavaVersion.VERSION_25
+        targetCompatibility = JavaVersion.VERSION_25
        toolchain {
-            languageVersion = buildJavaLanguageVersion
+            languageVersion = JavaLanguageVersion.of(25)
        }
    }

@@ -266,7 +262,7 @@ subprojects {

    tasks.withType(JavaCompile).configureEach {
        options.encoding = "UTF-8"
-        options.release = buildJavaMajorVersion
+        options.release = rootProject.ext.modernJavaVersion
        if (!project.hasProperty("noSpotless")) {
            dependsOn "spotlessApply"
        }
@@ -661,14 +657,10 @@ tasks.register('compileRestartHelper', JavaCompile) {
    source = fileTree(dir: 'scripts', include: 'RestartHelper.java')
    classpath = files()
    destinationDirectory = layout.buildDirectory.dir("restart-helper-classes")
-    def restartMajorVersion = buildJavaMajorVersion
-    def restartLanguageVersion = JavaLanguageVersion.of(restartMajorVersion)
+    def restartMajorVersion = project.ext.modernJavaVersion
    def restartCompatibility = JavaVersion.toVersion(restartMajorVersion.toString())
    sourceCompatibility = restartCompatibility
    targetCompatibility = restartCompatibility
-    javaCompiler = javaToolchains.compilerFor {
-        languageVersion = restartLanguageVersion
-    }
    options.release.set(restartMajorVersion)
 }
Author	SHA1	Message	Date
LudyandGitHub	45d5fe8f36	Merge branch 'main' into fix_mask_token	2026-07-09 23:14:04 +02:00
LudyandGitHub	06c5912aa5	Merge branch 'main' into fix_mask_token	2026-07-09 11:05:49 +02:00
LudyandGitHub	fb80854e9e	Merge branch 'main' into fix_mask_token	2026-07-04 14:28:23 +02:00
Ludy87	04a6be0699	Update AdminSettingsController.java	2026-06-27 08:32:08 +02:00
Ludy87	f070930c92	Mask botToken as a sensitive admin field AdminSettingsController: extend sensitive-field detection to include 'botToken' in addition to 'password' and 'secret', so bot tokens are treated as sensitive and can be masked in admin settings views.	2026-06-27 08:30:47 +02:00