Update zo 4.6.0

nroduit · Jan 31, 2025 · 7e4bec1 · 7e4bec1
1 parent 5cafdce
commit 7e4bec1
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -29,4 +29,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: mvn -Pcoverage -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
+        run: mvn -Pcoverage -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:5.0.0.4389:sonar
diff --git a/weasis-core/src/main/java/org/weasis/core/internal/cv/NativeOpenCVCodec.java b/weasis-core/src/main/java/org/weasis/core/internal/cv/NativeOpenCVCodec.java
@@ -62,10 +62,10 @@ public class NativeOpenCVCodec implements Codec<ImageElement> {
     "pbm",
     "pgm",
     "ppm",
-    "pxm",
+    "pxm", // NON-NLS
     "pnm",
     "ras",
-    "rast",
+    "rast", // NON-NLS
     "tiff",
     "tif",
     "hdr",

diff --git a/...icom/weasis-dicom-3d/viewer3d/src/main/java/org/weasis/dicom/viewer3d/messages.properties b/...icom/weasis-dicom-3d/viewer3d/src/main/java/org/weasis/dicom/viewer3d/messages.properties
@@ -42,7 +42,7 @@ capabilities.not.sufficient=These capabilities are not sufficient
 version.should.be=The version should be at least %s
 texture.maximum.size.of=Texture 3D has a maximum size of %sx%sx%s
 composite=Composite
-iso.surface=Iso surface
+iso.surface=Isosurface
 slice=Slice
 shininess=Shininess
 mip=MIP

diff --git a/weasis-distributions/etc/config/version-compatibility.json b/weasis-distributions/etc/config/version-compatibility.json
@@ -99,6 +99,11 @@
     "minimal-version": "4.5.0",
     "i18n-version": "4.0.0-SNAPSHOT"
   },
+  {
+    "release-version": "4.5.1",
+    "minimal-version": "4.5.0",
+    "i18n-version": "4.0.0-SNAPSHOT"
+  },
   {
     "release-version": "${app.version}",
     "minimal-version": "${base.minimal.version}",

diff --git a/weasis-parent/pom.xml b/weasis-parent/pom.xml
@@ -14,7 +14,7 @@
   <properties>
     <!-- force command line arguments settings to set version -->
     <!-- $ mvn clean install -Drevision=4.2.2 -Dchangelist=-SNAPSHOT -->
-    <revision>4.5.2</revision>
+    <revision>4.6.0</revision>
     <changelist>-SNAPSHOT</changelist>  <!-- Remove "-SNAPSHOT" for release -->
 
     <java-version>23</java-version>
@@ -25,7 +25,7 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
     <app.version>${revision}${changelist}</app.version>
-    <base.minimal.version>4.5.0</base.minimal.version>
+    <base.minimal.version>4.6.0</base.minimal.version>
     <i18n.version>4.0.0-SNAPSHOT</i18n.version>
     <weasis.releasenotes>https://github.com/nroduit/Weasis/blob/master/CHANGELOG.md#v451-2024-09-18</weasis.releasenotes>
-Original file line number
+Diff line change
@@ Expand Up @@
         "pbm",
         "pgm",
         "ppm",
-        "pxm",
+        "pxm", // NON-NLS
         "pnm",
         "ras",
-        "rast",
+        "rast", // NON-NLS
         "tiff",
         "tif",
         "hdr",
@@ Expand Down @@