Update weasis-dicom-tools to 5.31.1

nroduit · Nov 3, 2023 · c0d5280 · c0d5280
1 parent 098f165
commit c0d5280
Show file tree

Hide file tree

Showing 11 changed files with 72 additions and 30 deletions.
diff --git a/weasis-base/weasis-base-ui/pom.xml b/weasis-base/weasis-base-ui/pom.xml
@@ -39,8 +39,18 @@
       <artifactId>org.apache.felix.gogo.runtime</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.glassfish</groupId>
-      <artifactId>jakarta.json</artifactId>
+      <groupId>jakarta.json</groupId>
+      <artifactId>jakarta.json-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.parsson</groupId>
+      <artifactId>parsson</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.hk2</groupId>
+      <artifactId>osgi-resource-locator</artifactId>
       <scope>provided</scope>
     </dependency>
   </dependencies>

diff --git a/weasis-base/weasis-base-ui/src/main/java/org/weasis/base/ui/gui/WeasisWin.java b/weasis-base/weasis-base-ui/src/main/java/org/weasis/base/ui/gui/WeasisWin.java
@@ -32,6 +32,9 @@
 import bibliothek.gui.dock.util.DirectWindowProvider;
 import bibliothek.gui.dock.util.DockUtilities;
 import com.formdev.flatlaf.extras.FlatSVGIcon;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonReader;
 import java.awt.AWTException;
 import java.awt.BorderLayout;
 import java.awt.Component;
@@ -76,9 +79,6 @@
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonReader;
 import javax.management.InstanceNotFoundException;
 import javax.management.JMException;
 import javax.management.MBeanServer;

diff --git a/weasis-dicom/weasis-dicom-codec/pom.xml b/weasis-dicom/weasis-dicom-codec/pom.xml
@@ -82,6 +82,12 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <!-- Add osgi-resource-locator dependency for loading JsonProvider with dcm4che-json -->
+    <dependency>
+      <groupId>org.glassfish.hk2</groupId>
+      <artifactId>osgi-resource-locator</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.weasis.imageio</groupId>
       <artifactId>weasis-imageio-codec</artifactId>

diff --git a/...dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/rs/RsQueryResult.java b/...dicom/weasis-dicom-explorer/src/main/java/org/weasis/dicom/explorer/rs/RsQueryResult.java
@@ -9,6 +9,7 @@
  */
 package org.weasis.dicom.explorer.rs;
 
+import jakarta.json.Json;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URLEncoder;
@@ -19,7 +20,6 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
-import javax.json.Json;
 import org.dcm4che3.data.Attributes;
 import org.dcm4che3.data.Tag;
 import org.dcm4che3.json.JSONReader;

diff --git a/...icom/weasis-dicom-viewer2d/src/main/java/org/weasis/dicom/viewer2d/mip/SeriesBuilder.java b/...icom/weasis-dicom-viewer2d/src/main/java/org/weasis/dicom/viewer2d/mip/SeriesBuilder.java
@@ -179,7 +179,7 @@ public static void applyMipParameters(
             }
           } catch (Exception e) {
             if (raw != null) {
-              FileUtil.delete(raw.getFile());
+              FileUtil.delete(raw.file());
               raw = null;
             }
             LOGGER.error("Writing MIP", e);
@@ -188,7 +188,7 @@ public static void applyMipParameters(
             return;
           }
           RawImageIO rawIO = new RawImageIO(raw, null);
-          rawIO.getFileCache().setOriginalTempFile(raw.getFile());
+          rawIO.getFileCache().setOriginalTempFile(raw.file());
           rawIO.setBaseAttributes(cpTags);
 
           // Tags with same values for all the Series

diff --git a/...s-dicom/weasis-dicom-viewer2d/src/main/java/org/weasis/dicom/viewer2d/mpr/RawImageIO.java b/...s-dicom/weasis-dicom-viewer2d/src/main/java/org/weasis/dicom/viewer2d/mpr/RawImageIO.java
@@ -79,7 +79,7 @@ public void setBaseAttributes(Attributes attributes) {
   public File getDicomFile() {
     Attributes dcm = getDicomObject();
 
-    File file = imageCV.getFile();
+    File file = imageCV.file();
     BulkData bdl =
         new BulkData(
             file.toURI().toString(),
@@ -107,7 +107,7 @@ public PlanarImage getImageFragment(MediaElement media) throws Exception {
 
   @Override
   public URI getUri() {
-    return imageCV.getFile().toURI();
+    return imageCV.file().toURI();
   }
 
   @Override
@@ -239,7 +239,7 @@ private synchronized DicomMetaData readMetaData() {
     dcm.setSpecificCharacterSet(cs.toCodes());
     DicomMediaUtils.fillAttributes(tags, dcm);
     dcm.addAll(attributes);
-    File file = imageCV.getFile();
+    File file = imageCV.file();
     BulkData bdl =
         new BulkData(
             file.toURI().toString(),

diff --git a/...icom/weasis-dicom-viewer2d/src/main/java/org/weasis/dicom/viewer2d/mpr/SeriesBuilder.java b/...icom/weasis-dicom-viewer2d/src/main/java/org/weasis/dicom/viewer2d/mpr/SeriesBuilder.java
@@ -459,7 +459,7 @@ private static DicomSeries buildDicomSeriesFromRaw(
           newSeries[i].write(
               ImageProcessor.getRotatedImage(newSeries[i].read(), Core.ROTATE_90_CLOCKWISE));
         } catch (Exception e) {
-          FileUtil.delete(newSeries[i].getFile());
+          FileUtil.delete(newSeries[i].file());
           throw e;
         }
 
@@ -473,7 +473,7 @@ private static DicomSeries buildDicomSeriesFromRaw(
         }
       }
       RawImageIO rawIO = new RawImageIO(newSeries[i], null);
-      rawIO.getFileCache().setOriginalTempFile(newSeries[i].getFile());
+      rawIO.getFileCache().setOriginalTempFile(newSeries[i].file());
       rawIO.setBaseAttributes(cpTags);
 
       // Tags with same values for all the Series
@@ -643,7 +643,7 @@ private static double writeBlock(
       for (int i = 0; i < newSeries.length; i++) {
         if (newSeries[i] != null) {
           if (abort[0]) {
-            FileUtil.delete(newSeries[i].getFile());
+            FileUtil.delete(newSeries[i].file());
           } else {
             newSeries[i].write(builImgs[i]);
           }

diff --git a/weasis-distributions/etc/config/base.json b/weasis-distributions/etc/config/base.json
@@ -74,7 +74,7 @@
     },
     {
       "code": "felix.auto.start.4",
-      "value": "${dollar}{weasis.codebase.url}/bundle/org.apache.felix.bundlerepository-${felix.bundlerepository.version}.jar${xz.ext} ${dollar}{weasis.codebase.url}/bundle/jakarta.json-${javax.json.version}.jar${xz.ext} ${dollar}{weasis.codebase.url}/bundle/osgi.promise-${osgi.promise.version}.jar${xz.ext}",
+      "value": "${dollar}{weasis.codebase.url}/bundle/org.apache.felix.bundlerepository-${felix.bundlerepository.version}.jar${xz.ext} ${dollar}{weasis.codebase.url}/bundle/jakarta.json-api-${jakarta.json.version}.jar${xz.ext} ${dollar}{weasis.codebase.url}/bundle/parsson-${org.eclipse.parsson.version}.jar${xz.ext} ${dollar}{weasis.codebase.url}/bundle/osgi-resource-locator-${osgi.resource.locator.version}.jar${xz.ext} ${dollar}{weasis.codebase.url}/bundle/osgi.promise-${osgi.promise.version}.jar${xz.ext}",
       "description": "OSGI bundle repository",
       "type": "A",
       "category": "FELIX_INSTALL"

diff --git a/weasis-distributions/pom.xml b/weasis-distributions/pom.xml
@@ -261,9 +261,21 @@
                   <outputDirectory>${tmp.bundle.dir}</outputDirectory>
                 </artifactItem>
                 <artifactItem>
-                  <groupId>org.glassfish</groupId>
-                  <artifactId>jakarta.json</artifactId>
-                  <version>${javax.json.version}</version>
+                  <groupId>jakarta.json</groupId>
+                  <artifactId>jakarta.json-api</artifactId>
+                  <version>${jakarta.json.version}</version>
+                  <outputDirectory>${tmp.bundle.dir}</outputDirectory>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.eclipse.parsson</groupId>
+                  <artifactId>parsson</artifactId>
+                  <version>${org.eclipse.parsson.version}</version>
+                  <outputDirectory>${tmp.bundle.dir}</outputDirectory>
+                </artifactItem>
+                <artifactItem>
+                  <groupId>org.glassfish.hk2</groupId>
+                  <artifactId>osgi-resource-locator</artifactId>
+                  <version>${osgi.resource.locator.version}</version>
                   <outputDirectory>${tmp.bundle.dir}</outputDirectory>
                 </artifactItem>
                 <artifactItem>

diff --git a/weasis-launcher/conf/base.json b/weasis-launcher/conf/base.json
@@ -74,7 +74,7 @@
     },
     {
       "code": "felix.auto.start.4",
-      "value": "file:${maven.localRepository}/org/apache/felix/org.apache.felix.bundlerepository/${felix.bundlerepository.version}/org.apache.felix.bundlerepository-${felix.bundlerepository.version}.jar file:${maven.localRepository}/org/glassfish/jakarta.json/${javax.json.version}/jakarta.json-${javax.json.version}.jar file:${maven.localRepository}/org/osgi/osgi.promise/${osgi.promise.version}/osgi.promise-${osgi.promise.version}.jar",
+      "value": "file:${maven.localRepository}/org/apache/felix/org.apache.felix.bundlerepository/${felix.bundlerepository.version}/org.apache.felix.bundlerepository-${felix.bundlerepository.version}.jar file:${maven.localRepository}/jakarta/json/jakarta.json-api/${jakarta.json.version}/jakarta.json-api-${jakarta.json.version}.jar file:${maven.localRepository}/org/eclipse/parsson/parsson/${org.eclipse.parsson.version}/parsson-${org.eclipse.parsson.version}.jar file:${maven.localRepository}/org/glassfish/hk2/osgi-resource-locator/${osgi.resource.locator.version}/osgi-resource-locator-${osgi.resource.locator.version}.jar file:${maven.localRepository}/org/osgi/osgi.promise/${osgi.promise.version}/osgi.promise-${osgi.promise.version}.jar",
       "description": "OSGI bundle repository",
       "type": "A",
       "category": "FELIX_INSTALL"

diff --git a/weasis-parent/pom.xml b/weasis-parent/pom.xml
@@ -51,22 +51,24 @@
     <slf4j.version>1.7.36</slf4j.version>
     <sling.commons.log.version>3.0.2-r5</sling.commons.log.version>
     <dockingframes.version>1.1.6</dockingframes.version>
-    <weasis-dicom-tools.version>5.30.0</weasis-dicom-tools.version>
-    <weasis.core.img.version>4.8.0.1</weasis.core.img.version>
-    <weasis.opencv.native.version>4.8.0-dcm</weasis.opencv.native.version>
-    <javax.json.version>1.1.6</javax.json.version>
+    <weasis-dicom-tools.version>5.31.1</weasis-dicom-tools.version>
+    <weasis.core.img.version>4.8.1</weasis.core.img.version>
+    <weasis.opencv.native.version>4.8.1-dcm</weasis.opencv.native.version>
+    <jakarta.json.version>2.1.3</jakarta.json.version>
+    <org.eclipse.parsson.version>1.1.5</org.eclipse.parsson.version>
+    <osgi.resource.locator.version>2.5.0-b42</osgi.resource.locator.version>
     <jaxb.osgi.version>4.0.3</jaxb.osgi.version>
     <xml.bind-api.version>4.0.0</xml.bind-api.version>
     <joml.version>1.10.5</joml.version>
     <jogamp.version>2.5.0</jogamp.version>
     <jackson.version>2.15.1</jackson.version>
     <scribejava.version>8.3.3</scribejava.version>
-    <zip4j.version>2.11.4</zip4j.version>
+    <zip4j.version>2.11.5</zip4j.version>
 
     <assertj.version>3.24.2</assertj.version>
     <mockito.version>5.2.0</mockito.version>
     <byte-buddy.version>1.14.6</byte-buddy.version>
-    <byte-buddy-agent.version>1.14.1</byte-buddy-agent.version>
+    <byte-buddy-agent.version>1.14.2</byte-buddy-agent.version>
   </properties>
 
   <licenses>
@@ -505,9 +507,21 @@
         <scope>provided</scope>
       </dependency>
       <dependency>
-        <groupId>org.glassfish</groupId>
-        <artifactId>jakarta.json</artifactId>
-        <version>${javax.json.version}</version>
+        <groupId>jakarta.json</groupId>
+        <artifactId>jakarta.json-api</artifactId>
+        <version>${jakarta.json.version}</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.parsson</groupId>
+        <artifactId>parsson</artifactId>
+        <version>${org.eclipse.parsson.version}</version>
+        <scope>provided</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.glassfish.hk2</groupId>
+        <artifactId>osgi-resource-locator</artifactId>
+        <version>${osgi.resource.locator.version}</version>
         <scope>provided</scope>
       </dependency>
       <dependency>
@@ -656,8 +670,8 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-    <groupId>org.apache.felix</groupId>
-    <artifactId>org.apache.felix.prefs</artifactId>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.prefs</artifactId>
     </dependency>
 
     <!-- FOR TESTS -->