From commits-return-13522-apmail-sis-commits-archive=sis.apache.org@sis.apache.org  Wed Apr 29 07:17:16 2020
Return-Path: <commits-return-13522-apmail-sis-commits-archive=sis.apache.org@sis.apache.org>
X-Original-To: apmail-sis-commits-archive@www.apache.org
Delivered-To: apmail-sis-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [207.244.88.153])
	by minotaur.apache.org (Postfix) with SMTP id 0CF0D19CB6
	for <apmail-sis-commits-archive@www.apache.org>; Wed, 29 Apr 2020 07:17:14 +0000 (UTC)
Received: (qmail 14027 invoked by uid 500); 29 Apr 2020 07:17:14 -0000
Delivered-To: apmail-sis-commits-archive@sis.apache.org
Received: (qmail 13976 invoked by uid 500); 29 Apr 2020 07:17:14 -0000
Mailing-List: contact commits-help@sis.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@sis.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@sis.apache.org>
List-Post: <mailto:commits@sis.apache.org>
List-Id: <commits.sis.apache.org>
Reply-To: sis-dev@sis.apache.org
Delivered-To: mailing list commits@sis.apache.org
Received: (qmail 13965 invoked by uid 99); 29 Apr 2020 07:17:14 -0000
Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Apr 2020 07:17:14 +0000
Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33)
	id 2D1A4890A8; Wed, 29 Apr 2020 07:17:14 +0000 (UTC)
Date: Wed, 29 Apr 2020 07:17:14 +0000
To: "commits@sis.apache.org" <commits@sis.apache.org>
Subject: [sis] 01/01: feat(JavaFx): build for java 11, add maven dependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
From: jsorel@apache.org
In-Reply-To: <158814463358.24617.15291893207470975911@gitbox.apache.org>
References: <158814463358.24617.15291893207470975911@gitbox.apache.org>
X-Git-Host: gitbox.apache.org
X-Git-Repo: sis
X-Git-Refname: refs/heads/feat/javafx-on-11
X-Git-Reftype: branch
X-Git-Rev: e28177a5b735baf8b55262cc5e3aad2f767b639b
X-Git-NotificationType: diff
X-Git-Multimail-Version: 1.5.dev
Auto-Submitted: auto-generated
Message-Id: <20200429071714.2D1A4890A8@gitbox.apache.org>

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>