sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jso...@apache.org
Subject [sis] 01/01: feat(JavaFx): build for java 11, add maven dependencies
Date Wed, 29 Apr 2020 07:17:14 GMT
This is an automated email from the ASF dual-hosted git repository.

jsorel pushed a commit to branch feat/javafx-on-11
in repository https://gitbox.apache.org/repos/asf/sis.git

commit e28177a5b735baf8b55262cc5e3aad2f767b639b
Author: jsorel <johann.sorel@geomatys.com>
AuthorDate: Fri Apr 24 16:01:54 2020 +0200

    feat(JavaFx): build for java 11, add maven dependencies
---
 application/pom.xml            | 13 +------------
 application/sis-javafx/pom.xml | 33 ++++++++++++++++++++++++++++-----
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/application/pom.xml b/application/pom.xml
index a6ef1c1..b866cd8 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -120,17 +120,6 @@
     <module>sis-console</module>
     <module>sis-webapp</module>
     <module>sis-openoffice</module>
+    <module>sis-javafx</module>
   </modules>
-  <profiles>
-    <profile>
-      <activation>
-        <property>
-          <name>env.PATH_TO_FX</name>
-        </property>
-      </activation>
-      <modules>
-        <module>sis-javafx</module>
-      </modules>
-    </profile>
-  </profiles>
 </project>
diff --git a/application/sis-javafx/pom.xml b/application/sis-javafx/pom.xml
index d64e62d..cdcddd9 100644
--- a/application/sis-javafx/pom.xml
+++ b/application/sis-javafx/pom.xml
@@ -92,11 +92,8 @@
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <release>13</release>
-          <compilerArgs>
-            <arg>--module-path</arg> <arg>${env.PATH_TO_FX}</arg>
-            <arg>--add-modules</arg> <arg>javafx.graphics,javafx.controls</arg>
-          </compilerArgs>
+			<!-- 11 is the minimum supported by javafx 13.0.2 -->
+          <release>11</release>
         </configuration>
       </plugin>
 
@@ -166,6 +163,32 @@
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.openjfx</groupId>
+      <artifactId>javafx-graphics</artifactId>
+	<version>13.0.2</version>
+	</dependency>
+	<dependency>
+      <groupId>org.openjfx</groupId>
+      <artifactId>javafx-controls</artifactId>
+	<version>13.0.2</version>
+	</dependency>
+	<dependency>
+      <groupId>org.openjfx</groupId>
+      <artifactId>javafx-swing</artifactId>
+	<version>13.0.2</version>
+	</dependency>
+	<dependency>
+      <groupId>org.openjfx</groupId>
+      <artifactId>javafx-fxml</artifactId>
+	<version>13.0.2</version>
+	</dependency>
+	<dependency>
+      <groupId>org.openjfx</groupId>
+      <artifactId>javafx-web</artifactId>
+      <version>13.0.2</version>
+    </dependency>
+
   </dependencies>
 
 </project>


Mime
View raw message