Merge pull request #689 from dlsc-software-consulting-gmbh/develop

develop

Author: dlemmermann

.github/workflows/macos.yml

@@ -1,9 +1,5 @@
 name: macOS
 
-on:
-  push:
-    branches: [ master ]
-
 jobs:
   build:
     runs-on: macos-latest

.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.8/apache-maven-3.8.8-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.10/apache-maven-3.9.10-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

app/pom.xml

@@ -18,7 +18,9 @@
         <maven.javadoc.skip>true</maven.javadoc.skip>
         <gluonfx.plugin.version>1.0.25</gluonfx.plugin.version>
         <javafx.plugin.version>0.0.8</javafx.plugin.version>
-        <mainClassName>com.dlsc.jfxcentral2.app.JFXCentral2MobileApp</mainClassName>
+        <mainClassName>com.dlsc.jfxcentral2.app.JFXCentral2App</mainClassName>
+        <mainClassName.jpro>com.dlsc.jfxcentral2.app.JFXCentral2App</mainClassName.jpro>
+        <mainClassName.mobile>com.dlsc.jfxcentral2.app.JFXCentral2MobileApp</mainClassName.mobile>
         <app.description>JFXCentral for anything JavaFX</app.description>
         <package.type/>
         <mac.app.store/>
@@ -110,7 +112,7 @@
         </dependency>
 
         <dependency>
-            <groupId>com.sandec.jpro</groupId>
+            <groupId>one.jpro</groupId>
             <artifactId>jpro-webapi</artifactId>
         </dependency>
 
@@ -440,7 +442,7 @@
                         <list>browser</list>
                         <list>video</list>
                     </attachList>
-                    <mainClass>${mainClassName}</mainClass>
+                    <mainClass>${mainClassName.mobile}</mainClass>
                     <releaseConfiguration>
                         <vendor>Gluon</vendor>
                         <description>${app.description}</description>
@@ -471,10 +473,14 @@
                 <artifactId>jpro-maven-plugin</artifactId>
                 <version>${jpro.version}</version>
                 <configuration>
-                    <mainClassName>${mainClassName}</mainClassName>
+                    <mainClassName>${mainClassName.jpro}</mainClassName>
                     <releaseName>jfxcentral</releaseName>
                     <localJVMArgs>-Ddevelop=false</localJVMArgs>
                     <port>8088</port>
+                    <releasePlatforms>
+                        <platform>linux</platform>
+                        <platform>current</platform>
+                    </releasePlatforms>
                 </configuration>
             </plugin>