update dependency

Author: mfleisch

sirius_gui/build.gradle

@@ -58,48 +58,4 @@ dependencies {
 
     // Adds dependency to the Swing UI toolkit integration.
     implementation(jxbrowser.swing)
-}
-
-// Define the output directory for the generated resources
-def jxLicenseDirName = "jxLicense";
-def generatedResourcesDir = layout.buildDirectory.dir("generated/resources/$jxLicenseDirName")
-
-// Add the generated resources directory to the main source set
-sourceSets {
-    main {
-        resources {
-            srcDir generatedResourcesDir
-        }
-    }
-}
-
-// Create task to generate the properties file with the license key
-tasks.register('generateJxLicenceProperties') {
-    doLast {
-        // Ensure the output directory exists
-        def outputDir = file(generatedResourcesDir)
-        outputDir.mkdirs()
-
-        // Create the properties file
-        def propertiesFile = file("$outputDir/${jxLicenseDirName}.build.properties")
-
-        // Write the key to the file
-        if (project.hasProperty('jxbrowser.license.key')) {
-            // Read the key from gradle.properties. Provide a default value for safety.
-            propertiesFile.text = "jxbrowser.license.key=${project.property('jxbrowser.license.key')}"
-        } else {
-            logger.lifecycle("\n" +
-                    "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" +
-                    "!! WARNING: 'jxbrowser.license.key' is missing or empty in gradle.properties !!\n" +
-                    "!! The application may not function correctly without it.                    !!\n" +
-                    "!! Please add the key to your user's properties file:                        !!\n" +
-                    "!! Location: ~/.gradle/gradle.properties                                     !!\n" +
-                    "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n")
-            propertiesFile.text = ""
-        }
-    }
-}
-
-// Hook the custom task into the build process
-// This ensures task runs before the resources are processed.
-processResources.dependsOn('generateJxLicenceProperties')
+}

sirius_gui/src/main/java/io/sirius/ms/gui/webView/jxbrowser/JxBrowserPanelProvider.java

@@ -10,14 +10,15 @@
 import de.unijena.bioinf.ms.gui.configs.Colors;
 import io.sirius.ms.gui.webView.BrowserPanelProvider;
 import io.sirius.ms.gui.webView.LinkInterception;
-import de.unijena.bioinf.ms.properties.PropertyManager;
 import it.unimi.dsi.fastutil.Pair;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 
 import java.net.URI;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.List;
 
 import static com.teamdev.jxbrowser.engine.RenderingMode.OFF_SCREEN;
@@ -40,7 +41,7 @@ public JxBrowserPanelProvider(@NotNull URI baseUrl) {
     private static Engine setupEngine() {
         EngineOptions opts = EngineOptions
                 .newBuilder(OFF_SCREEN)
-                .licenseKey(PropertyManager.getPropertyB64("jxbrowser.license.key"))
+                .licenseKey(new String(Base64.getDecoder().decode(System.getProperty("jxbrowser.license.key")), StandardCharsets.UTF_8))
                 .disableTouchMenu()
                 .enableIncognito() // no storage dir, all in memory, fresh state after every start.
                 .build();

sirius_rest_service/build.gradle

@@ -76,7 +76,7 @@ dependencies {
     implementation 'org.springframework.security:spring-security-oauth2-jose'
 
 
-    implementation 'com.brightgiant:secure-api:1.0.1'
+    implementation 'com.brightgiant:secure-api:1.1.0'
 
 }
 //todo use logback instead of java util logging! => needs support in jjobs

sirius_rest_service/src/main/java/de/unijena/bioinf/ms/middleware/SiriusMiddlewareApplication.java

@@ -19,6 +19,7 @@
 
 package de.unijena.bioinf.ms.middleware;
 
+import com.brightgiant.jxsupport.JxSupport;
 import de.unijena.bioinf.ChemistryBase.jobs.SiriusJobs;
 import de.unijena.bioinf.auth.AuthService;
 import de.unijena.bioinf.auth.AuthServices;
@@ -41,7 +42,6 @@
 import de.unijena.bioinf.ms.middleware.service.projects.ProjectsProvider;
 import de.unijena.bioinf.ms.properties.PropertyManager;
 import de.unijena.bioinf.projectspace.ProjectSpaceManagerFactory;
-import de.unijena.bioinf.rest.ProxyManager;
 import io.sirius.ms.sdk.SiriusSDK;
 import io.sirius.ms.sdk.model.GuiInfo;
 import io.sirius.ms.sdk.model.ProjectInfo;
@@ -117,6 +117,7 @@ public static void main(String[] args) {
                     Thread.currentThread().getContextClassLoader()
             ));
         } else {
+            JxSupport.activate();
             // SwingJobManager is needed to show loading screens in GUI
             SiriusJobs.setJobManagerFactory((cpuThreads) -> new SwingJobManager(
                     cpuThreads,