From e87d2baebbb700aa03594b0558f052b0e55369fc Mon Sep 17 00:00:00 2001
From: Nicolas Roduit <nicolas.roduit@gmail.com>
Date: Fri, 22 Mar 2024 10:22:42 +0100
Subject: [PATCH] Fix minor issues

---
 annotations/idea/org/slf4j/annotations.xml    |  3 ++
 weasis-distributions/etc/config/base.json     | 40 +++++++-------
 weasis-launcher/conf/base.json                | 34 ++++++------
 .../java/org/weasis/launcher/Singleton.java   |  2 +-
 .../org/weasis/launcher/WeasisLauncher.java   |  2 +-
 weasis-parent/pom.xml                         | 52 ++++++++++++-------
 6 files changed, 76 insertions(+), 57 deletions(-)

diff --git a/annotations/idea/org/slf4j/annotations.xml b/annotations/idea/org/slf4j/annotations.xml
index 393249338..57b1935b6 100755
--- a/annotations/idea/org/slf4j/annotations.xml
+++ b/annotations/idea/org/slf4j/annotations.xml
@@ -50,6 +50,9 @@
   <item name='org.slf4j.Logger void trace(java.lang.String, java.lang.Object)'>
     <annotation name='org.jetbrains.annotations.NonNls'/>
   </item>
+  <item name='org.slf4j.Logger void trace(java.lang.String, java.lang.Object, java.lang.Object)'>
+    <annotation name='org.jetbrains.annotations.NonNls'/>
+  </item>
   <item name='org.slf4j.Logger void warn(java.lang.String)'>
     <annotation name='org.jetbrains.annotations.NonNls'/>
   </item>
diff --git a/weasis-distributions/etc/config/base.json b/weasis-distributions/etc/config/base.json
index 06b72cb92..acdb0aacf 100644
--- a/weasis-distributions/etc/config/base.json
+++ b/weasis-distributions/etc/config/base.json
@@ -444,7 +444,7 @@
       "value": "true",
       "description": "Start to download series immediately",
       "type": "F",
-      "JavaType": "BOOLEAN",
+      "javaType": "BOOLEAN",
       "category": "DICOM"
     },
     {
@@ -452,7 +452,7 @@
       "value": "3",
       "description": "The number of concurrently downloaded series",
       "type": "A",
-      "JavaType": "INT",
+      "javaType": "INT",
       "category": "DICOM"
     },
     {
@@ -460,7 +460,7 @@
       "value": "4",
       "description": "The number of concurrently downloaded images in a series",
       "type": "A",
-      "JavaType": "INT",
+      "javaType": "INT",
       "category": "DICOM"
     },
     {
@@ -468,7 +468,7 @@
       "value": "true",
       "description": "Allow applying Window/Level on color images",
       "type": "F",
-      "JavaType": "BOOLEAN",
+      "javaType": "BOOLEAN",
       "category": "VIEWER"
     },
     {
@@ -476,7 +476,7 @@
       "value": "true",
       "description": "Inverse level direction (moving the cursor down to increase brightness",
       "type": "F",
-      "JavaType": "BOOLEAN",
+      "javaType": "BOOLEAN",
       "category": "VIEWER"
     },
     {
@@ -484,7 +484,7 @@
       "value": "false",
       "description": "Apply by default the most recent Presentation State to the related image",
       "type": "F",
-      "JavaType": "BOOLEAN",
+      "javaType": "BOOLEAN",
       "category": "VIEWER"
     },
     {
@@ -492,7 +492,7 @@
       "value": "false",
       "description": "Force to detect a graphic card at every launch",
       "type": "A",
-      "JavaType": "BOOLEAN",
+      "javaType": "BOOLEAN",
       "category": "VIEWER"
     },
     {
@@ -528,7 +528,7 @@
       "value": "true",
       "description": "Show the import image toolbar and menu",
       "type": "A",
-      "JavaType": "BOOLEAN",
+      "javaType": "BOOLEAN",
       "category": "UI"
     },
     {
@@ -536,7 +536,7 @@
       "value": "true",
       "description": "Show the DICOM import menu and dialog",
       "type": "A",
-      "JavaType": "BOOLEAN",
+      "javaType": "BOOLEAN",
       "category": "UI"
     },
     {
@@ -544,7 +544,7 @@
       "value": "true",
       "description": "Show the DICOM Q/R page in the DICOM Export dialog",
       "type": "A",
-      "JavaType": "BOOLEAN",
+      "javaType": "BOOLEAN",
       "category": "UI"
     },
     {
@@ -552,7 +552,7 @@
       "value": "true",
       "description": "Show the DICOM export menu and dialog",
       "type": "A",
-      "JavaType": "BOOLEAN",
+      "javaType": "BOOLEAN",
       "category": "UI"
     },
     {
@@ -560,7 +560,7 @@
       "value": "true",
       "description": "Show the send page in the DICOM Export dialog",
       "type": "A",
-      "JavaType": "BOOLEAN",
+      "javaType": "BOOLEAN",
       "category": "UI"
     },
     {
@@ -568,7 +568,7 @@
       "value": "7170",
       "description": "Show all mouse buttons. Sum of LEFT=1024 + MIDDLE=2048 + RIGHT=4096 + SCROLL=2. Show all:7170 and show none:0.",
       "type": "A",
-      "JavaType": "INT",
+      "javaType": "INT",
       "category": "UI"
     },
     {
@@ -576,7 +576,7 @@
       "value": "false",
       "description": "Show all the cine toolbars",
       "type": "A",
-      "JavaType": "BOOLEAN",
+      "javaType": "BOOLEAN",
       "category": "UI"
     },
     {
@@ -584,7 +584,7 @@
       "value": "false",
       "description": "Show all the key object toolbars",
       "type": "A",
-      "JavaType": "BOOLEAN",
+      "javaType": "BOOLEAN",
       "category": "UI"
     },
     {
@@ -592,7 +592,7 @@
       "value": "false",
       "description": "Show the rotation toolbars in DICOM 2D viewer",
       "type": "A",
-      "JavaType": "BOOLEAN",
+      "javaType": "BOOLEAN",
       "category": "UI"
     },
     {
@@ -600,7 +600,7 @@
       "value": "false",
       "description": "Show LUT Shape in the contextual menu",
       "type": "A",
-      "JavaType": "BOOLEAN",
+      "javaType": "BOOLEAN",
       "category": "UI"
     },
     {
@@ -608,7 +608,7 @@
       "value": "false",
       "description": "Show LUT in the contextual menu",
       "type": "A",
-      "JavaType": "BOOLEAN",
+      "javaType": "BOOLEAN",
       "category": "UI"
     },
     {
@@ -616,8 +616,8 @@
       "value": "false",
       "description": "Show Filter in the contextual menu",
       "type": "A",
-      "JavaType": "BOOLEAN",
+      "javaType": "BOOLEAN",
       "category": "UI"
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/weasis-launcher/conf/base.json b/weasis-launcher/conf/base.json
index ed68153ca..76a21c23d 100644
--- a/weasis-launcher/conf/base.json
+++ b/weasis-launcher/conf/base.json
@@ -475,7 +475,7 @@
       "value": "true",
       "description": "Allow applying Window/Level on color images",
       "type": "F",
-      "JavaType": "BOOLEAN",
+      "javaType": "BOOLEAN",
       "category": "VIEWER"
     },
     {
@@ -483,7 +483,7 @@
       "value": "true",
       "description": "Inverse level direction (moving the cursor down to increase brightness",
       "type": "F",
-      "JavaType": "BOOLEAN",
+      "javaType": "BOOLEAN",
       "category": "VIEWER"
     },
     {
@@ -491,7 +491,7 @@
       "value": "false",
       "description": "Apply by default the most recent Presentation State to the related image",
       "type": "F",
-      "JavaType": "BOOLEAN",
+      "javaType": "BOOLEAN",
       "category": "VIEWER"
     },
     {
@@ -499,7 +499,7 @@
       "value": "false",
       "description": "Force to detect a graphic card at every launch",
       "type": "A",
-      "JavaType": "BOOLEAN",
+      "javaType": "BOOLEAN",
       "category": "VIEWER"
     },
     {
@@ -535,7 +535,7 @@
       "value": "true",
       "description": "Show the import image toolbar and menu",
       "type": "A",
-      "JavaType": "BOOLEAN",
+      "javaType": "BOOLEAN",
       "category": "UI"
     },
     {
@@ -543,7 +543,7 @@
       "value": "true",
       "description": "Show the DICOM import menu and dialog",
       "type": "A",
-      "JavaType": "BOOLEAN",
+      "javaType": "BOOLEAN",
       "category": "UI"
     },
     {
@@ -551,7 +551,7 @@
       "value": "true",
       "description": "Show the DICOM Q/R page in the DICOM Export dialog",
       "type": "A",
-      "JavaType": "BOOLEAN",
+      "javaType": "BOOLEAN",
       "category": "UI"
     },
     {
@@ -559,7 +559,7 @@
       "value": "true",
       "description": "Show the DICOM export menu and dialog",
       "type": "A",
-      "JavaType": "BOOLEAN",
+      "javaType": "BOOLEAN",
       "category": "UI"
     },
     {
@@ -567,7 +567,7 @@
       "value": "true",
       "description": "Show the send page in the DICOM Export dialog",
       "type": "A",
-      "JavaType": "BOOLEAN",
+      "javaType": "BOOLEAN",
       "category": "UI"
     },
     {
@@ -575,7 +575,7 @@
       "value": "7170",
       "description": "Show all mouse buttons. Sum of LEFT=1024 + MIDDLE=2048 + RIGHT=4096 + SCROLL=2. Show all:7170 and show none:0.",
       "type": "A",
-      "JavaType": "INT",
+      "javaType": "INT",
       "category": "UI"
     },
     {
@@ -583,7 +583,7 @@
       "value": "false",
       "description": "Show all the cine toolbars",
       "type": "A",
-      "JavaType": "BOOLEAN",
+      "javaType": "BOOLEAN",
       "category": "UI"
     },
     {
@@ -591,7 +591,7 @@
       "value": "false",
       "description": "Show all the key object toolbars",
       "type": "A",
-      "JavaType": "BOOLEAN",
+      "javaType": "BOOLEAN",
       "category": "UI"
     },
     {
@@ -599,7 +599,7 @@
       "value": "false",
       "description": "Show the rotation toolbars in DICOM 2D viewer",
       "type": "A",
-      "JavaType": "BOOLEAN",
+      "javaType": "BOOLEAN",
       "category": "UI"
     },
     {
@@ -607,7 +607,7 @@
       "value": "false",
       "description": "Show LUT Shape in the contextual menu",
       "type": "A",
-      "JavaType": "BOOLEAN",
+      "javaType": "BOOLEAN",
       "category": "UI"
     },
     {
@@ -615,7 +615,7 @@
       "value": "false",
       "description": "Show LUT in the contextual menu",
       "type": "A",
-      "JavaType": "BOOLEAN",
+      "javaType": "BOOLEAN",
       "category": "UI"
     },
     {
@@ -623,8 +623,8 @@
       "value": "false",
       "description": "Show Filter in the contextual menu",
       "type": "A",
-      "JavaType": "BOOLEAN",
+      "javaType": "BOOLEAN",
       "category": "UI"
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/weasis-launcher/src/main/java/org/weasis/launcher/Singleton.java b/weasis-launcher/src/main/java/org/weasis/launcher/Singleton.java
index cd5899cee..54e882448 100755
--- a/weasis-launcher/src/main/java/org/weasis/launcher/Singleton.java
+++ b/weasis-launcher/src/main/java/org/weasis/launcher/Singleton.java
@@ -100,7 +100,7 @@ public static void stop() {
 
       try (Socket socket = new Socket(LOCALHOST, siServer.getPort());
           OutputStream os = socket.getOutputStream();
-          PrintStream out = new PrintStream(os, true, Charset.defaultCharset().name())) {
+          PrintStream out = new PrintStream(os, true, Charset.defaultCharset())) {
         byte[] encoding = new byte[1];
         encoding[0] = ENCODING_PLATFORM;
         os.write(encoding);
diff --git a/weasis-launcher/src/main/java/org/weasis/launcher/WeasisLauncher.java b/weasis-launcher/src/main/java/org/weasis/launcher/WeasisLauncher.java
index 73c1bafcc..62bec7f41 100755
--- a/weasis-launcher/src/main/java/org/weasis/launcher/WeasisLauncher.java
+++ b/weasis-launcher/src/main/java/org/weasis/launcher/WeasisLauncher.java
@@ -1183,7 +1183,7 @@ private void shutdownHook() {
         mFelix.waitForStop(30_000);
       }
     } catch (Exception ex) {
-      System.err.println("Error stopping framework: " + ex); // NON-NLS
+      System.err.println(STR."Error stopping framework: \{ex}"); // NON-NLS
       if (ex instanceof InterruptedException) {
         Thread.currentThread().interrupt();
       }
diff --git a/weasis-parent/pom.xml b/weasis-parent/pom.xml
index 5126ebb90..6e4bc8dbb 100755
--- a/weasis-parent/pom.xml
+++ b/weasis-parent/pom.xml
@@ -20,7 +20,7 @@
     <java-version>21</java-version>
     <jdk-version>21</jdk-version>
     <enforcer.jdk-version>[${jdk-version},)</enforcer.jdk-version>
-    <enforcer.maven-version>[3.5.3,)</enforcer.maven-version>
+    <enforcer.maven-version>[3.6.3,)</enforcer.maven-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
@@ -30,8 +30,8 @@
     <weasis.releasenotes>https://github.com/nroduit/Weasis/blob/master/CHANGELOG.md#v430-2024-02-16</weasis.releasenotes>
 
     <felix.framework.version>7.0.5</felix.framework.version>
-    <flatlaf.version>3.3</flatlaf.version>
-    <miglayout.version>11.0</miglayout.version>
+    <flatlaf.version>3.4</flatlaf.version>
+    <miglayout.version>11.3</miglayout.version>
     <xz.version>1.9</xz.version>
 
     <osgi.core.version>8.0.0</osgi.core.version>
@@ -62,6 +62,14 @@
     <jackson.version>2.15.1</jackson.version>
     <scribejava.version>8.3.3</scribejava.version>
     <zip4j.version>2.11.5</zip4j.version>
+
+    <junit-bom.version>5.10.2</junit-bom.version>
+    <mockito.version>5.11.0</mockito.version>
+    <mockito-inline.version>5.2.0</mockito-inline.version>
+    <junit-pioneer.version>2.2.0</junit-pioneer.version>
+
+    <!--suppress UnresolvedMavenProperty -->
+    <argLine>-Djava.library.path=${project.build.directory}/lib/${os-name}-${cpu-name}</argLine>
   </properties>
 
   <licenses>
@@ -161,7 +169,7 @@
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>flatten-maven-plugin</artifactId>
-          <version>1.3.0</version>
+          <version>1.5.0</version>
         </plugin>
          <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -180,6 +188,7 @@
           <artifactId>maven-surefire-plugin</artifactId>
           <version>3.2.5</version>
           <configuration>
+            <!--suppress UnresolvedMavenProperty -->
             <argLine>@{argLine} --enable-preview -Xshare:off -javaagent:${net.bytebuddy:byte-buddy-agent:jar}</argLine>
             <parallel>all</parallel>
           </configuration>
@@ -555,22 +564,18 @@
 
       <!-- FOR TESTS -->
       <dependency>
-        <groupId>org.mockito</groupId>
-        <artifactId>mockito-junit-jupiter</artifactId>
-        <version>5.4.0</version>
-        <scope>test</scope>
+        <groupId>org.junit</groupId>
+        <artifactId>junit-bom</artifactId>
+        <version>${junit-bom.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.mockito</groupId>
-        <artifactId>mockito-inline</artifactId>
-        <version>5.2.0</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.junit-pioneer</groupId>
-        <artifactId>junit-pioneer</artifactId>
-        <version>2.0.1</version>
-        <scope>test</scope>
+        <artifactId>mockito-bom</artifactId>
+        <version>${mockito.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -663,14 +668,25 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-junit-jupiter</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-inline</artifactId>
+      <version>${mockito-inline.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.junit-pioneer</groupId>
       <artifactId>junit-pioneer</artifactId>
+      <version>${junit-pioneer.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -679,4 +695,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-</project>
+</project>
\ No newline at end of file