updated JPro, dependencies, fix for images not updating.

dlsc-software-consulting-gmbh · Dec 9, 2024 · 2f01996 · 2f01996
1 parent a6a8a47
commit 2f01996
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 11 deletions.
diff --git a/app/pom.xml b/app/pom.xml
@@ -127,7 +127,7 @@
         </dependency>
 
         <dependency>
-            <groupId>com.sandec.jpro</groupId>
+            <groupId>one.jpro</groupId>
             <artifactId>jpro-webapi</artifactId>
         </dependency>
 
@@ -492,6 +492,10 @@
                     <releaseName>jfxcentral</releaseName>
                     <localJVMArgs>-Ddevelop=false</localJVMArgs>
                     <port>8088</port>
+                    <releasePlatforms>
+                        <platform>linux</platform>
+                        <platform>current</platform>
+                    </releasePlatforms>
                 </configuration>
             </plugin>
 

diff --git a/components/pom.xml b/components/pom.xml
@@ -199,7 +199,7 @@
         </dependency>
         <dependency>
             <groupId>one.jpro.platform</groupId>
-            <artifactId>jpro-internal-util</artifactId>
+            <artifactId>jpro-utils</artifactId>
             <version>${jpro.platform.version}</version>
         </dependency>
 

diff --git a/components/src/main/java/com/dlsc/jfxcentral2/utils/OSUtil.java b/components/src/main/java/com/dlsc/jfxcentral2/utils/OSUtil.java
@@ -1,6 +1,6 @@
 package com.dlsc.jfxcentral2.utils;
 
-import one.jpro.platform.internal.util.PlatformUtils;
+import one.jpro.platform.utils.PlatformUtils;
 import org.apache.commons.lang3.StringUtils;
 
 public class OSUtil {

diff --git a/components/src/main/java/module-info.java b/components/src/main/java/module-info.java
@@ -34,7 +34,7 @@
     requires com.google.gson;
 
     requires one.jpro.platform.image.manager;
-    requires one.jpro.platform.internal.util;
+    requires one.jpro.platform.utils;
 
     requires org.kordamp.ikonli.javafx;
     requires org.kordamp.ikonli.core;

diff --git a/mobile/pom.xml b/mobile/pom.xml
@@ -204,7 +204,7 @@
         </dependency>
         <dependency>
             <groupId>one.jpro.platform</groupId>
-            <artifactId>jpro-internal-util</artifactId>
+            <artifactId>jpro-utils</artifactId>
             <version>${jpro.platform.version}</version>
         </dependency>
 
@@ -460,7 +460,7 @@
         </dependency>
         <dependency>
             <groupId>one.jpro.platform</groupId>
-            <artifactId>jpro-internal-util</artifactId>
+            <artifactId>jpro-utils</artifactId>
             <version>${jpro.platform.version}</version>
         </dependency>
         <dependency>

diff --git a/mobile/src/main/java/module-info.java b/mobile/src/main/java/module-info.java
@@ -33,7 +33,7 @@
     requires com.google.gson;
 
     requires one.jpro.platform.image.manager;
-    requires one.jpro.platform.internal.util;
+    requires one.jpro.platform.utils;
 
     requires org.kordamp.ikonli.javafx;
     requires org.kordamp.ikonli.core;

diff --git a/pom.xml b/pom.xml
@@ -31,8 +31,8 @@
         <javafx.version>22.0.1</javafx.version>
         <junit.version>5.10.0</junit.version>
         <ikonli.version>12.3.1</ikonli.version>
-        <jpro.version>2024.3.3</jpro.version>
-        <jpro.platform.version>0.3.1</jpro.platform.version>
+        <jpro.version>2024.4.1</jpro.version>
+        <jpro.platform.version>0.5.1-SNAPSHOT</jpro.platform.version>
         <batik.version>1.16</batik.version>
         <attach.version>4.0.19</attach.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -240,14 +240,26 @@
             </dependency>
 
             <dependency>
-                <groupId>de.sandec</groupId>
+                <groupId>one.jpro</groupId>
                 <artifactId>JMemoryBuddy</artifactId>
-                <version>0.5.3</version>
+                <version>0.5.6</version>
             </dependency>
 
             <dependency>
                 <groupId>com.sandec.jpro</groupId>
                 <artifactId>jpro-webapi</artifactId>
+                <version>2024.3.3</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.openjfx</groupId>
+                        <artifactId>*</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
+            <dependency>
+                <groupId>one.jpro</groupId>
+                <artifactId>jpro-webapi</artifactId>
                 <version>${jpro.version}</version>
                 <exclusions>
                     <exclusion>