sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject [sis] 01/01: Merge branch 'feat/javafx-on-11' into geoapi-4.0 with the following amendments: - The previous way using pre-installed JavaFX is kept. - Maven dependencies under "provided" scope and included only if "javafx" profile is activated. - JavaFX dependency upgraded from 13.0.2 to 14.0.1. - License declared in NOTICE file.
Date Wed, 13 May 2020 21:47:47 GMT
This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 9a757c1cc6eeea9a83c9d4320959f71f4b4cfc3c
Merge: 7498ef3 7b6698f
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Wed May 13 23:42:00 2020 +0200

    Merge branch 'feat/javafx-on-11' into geoapi-4.0 with the following amendments:
    - The previous way using pre-installed JavaFX is kept.
    - Maven dependencies under "provided" scope and included only if "javafx" profile is activated.
    - JavaFX dependency upgraded from 13.0.2 to 14.0.1.
    - License declared in NOTICE file.

 NOTICE                         | 14 +++++++--
 application/pom.xml            |  3 +-
 application/sis-javafx/pom.xml | 70 ++++++++++++++++++++++++++++++++++++++----
 pom.xml                        | 10 +++---
 4 files changed, 83 insertions(+), 14 deletions(-)

diff --cc NOTICE
index 35010ae,35010ae..b6d81b3
--- a/NOTICE
+++ b/NOTICE
@@@ -1,5 -1,5 +1,5 @@@
  Apache Spatial Information System (SIS)
--Copyright 2010-2019 The Apache Software Foundation
++Copyright 2010-2020 The Apache Software Foundation
  
  This product includes software developed at
  The Apache Software Foundation (http://www.apache.org/).
@@@ -33,6 -33,6 +33,14 @@@ The test suite uses software developed 
  under Eclipse public license version 2.
  http://junit.org/junit4/
  
--The `non-free` group of modules contain geodetic data collected
--by the International Association of Oil and Gas Producers.
++
++-------------------------------------------------------------
++  Optional modules NOT included unless explicitly requested
++-------------------------------------------------------------
++The optional `non-free` group of modules contain geodetic data
++collected by the International Association of Oil and Gas Producers.
  http://www.epsg.org/TermsOfUse.aspx
++
++The optional `sis-javafx` module depends on JavaFX
++published under GPL 2 with classpath exception.
++https://github.com/openjdk/jfx/blob/master/LICENSE
diff --cc application/pom.xml
index a6ef1c1,b866cd8..bdb5711
--- a/application/pom.xml
+++ b/application/pom.xml
@@@ -114,23 -114,12 +114,24 @@@
    <!-- ===========================================================
             Sub-modules included in the build in dependency order.
             JavaFX module is built only if PATH_TO_FX environment
--           variable is set.
++           variable is set or if "javafx" profile is activated.
         =========================================================== -->
    <modules>
      <module>sis-console</module>
      <module>sis-webapp</module>
      <module>sis-openoffice</module>
 -    <module>sis-javafx</module>
    </modules>
 +  <profiles>
 +    <profile>
++      <id>javafx</id>
 +      <activation>
 +        <property>
 +          <name>env.PATH_TO_FX</name>
 +        </property>
 +      </activation>
 +      <modules>
 +        <module>sis-javafx</module>
 +      </modules>
 +    </profile>
 +  </profiles>
  </project>
diff --cc application/sis-javafx/pom.xml
index d64e62d,cdcddd9..750b177
--- a/application/sis-javafx/pom.xml
+++ b/application/sis-javafx/pom.xml
@@@ -37,7 -37,7 +37,7 @@@
         =========================================================== -->
    <groupId>org.apache.sis.application</groupId>
    <artifactId>sis-javafx</artifactId>
--  <name>Apache SIS application for JavaFX</name>
++  <name>Apache SIS application for JavaFX (optional)</name>
    <description>
      Client application for JavaFX.
      This module require the JavaFX environment to be pre-installed.
@@@ -92,11 -92,8 +92,7 @@@
        <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>
++          <release>11</release>     <!-- Minimal version required by JavaFX.
-->
          </configuration>
        </plugin>
  
@@@ -166,6 -163,32 +162,68 @@@
        <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>
  
++  <profiles>
++    <!-- Dependencies under GPL + classpath exception included only if explicitly requested.
-->
++    <profile>
++      <id>javafx</id>
++      <dependencies>
++        <dependency>
++          <groupId>org.openjfx</groupId>
++          <artifactId>javafx-graphics</artifactId>
++          <version>${javafx.version}</version>
++          <scope>provided</scope>
++        </dependency>
++        <dependency>
++          <groupId>org.openjfx</groupId>
++          <artifactId>javafx-controls</artifactId>
++          <version>${javafx.version}</version>
++          <scope>provided</scope>
++        </dependency>
++        <dependency>
++          <groupId>org.openjfx</groupId>
++          <artifactId>javafx-swing</artifactId>
++          <version>${javafx.version}</version>
++          <scope>provided</scope>
++        </dependency>
++        <dependency>
++          <groupId>org.openjfx</groupId>
++          <artifactId>javafx-fxml</artifactId>
++          <version>${javafx.version}</version>
++          <scope>provided</scope>
++        </dependency>
++        <dependency>
++          <groupId>org.openjfx</groupId>
++          <artifactId>javafx-web</artifactId>
++          <version>${javafx.version}</version>
++          <scope>provided</scope>
++        </dependency>
++      </dependencies>
++    </profile>
++
++    <!-- Alternative way to compile sis-javafx without above Maven depencencies. -->
++    <profile>
++      <activation>
++        <property>
++          <name>env.PATH_TO_FX</name>
++        </property>
++      </activation>
++      <build>
++        <plugins>
++          <!-- To be removed after SIS has been fully modularized. -->
++          <plugin>
++            <artifactId>maven-compiler-plugin</artifactId>
++            <configuration>
++              <compilerArgs>
++                <arg>--module-path</arg> <arg>${env.PATH_TO_FX}</arg>
++                <arg>--add-modules</arg> <arg>javafx.graphics,javafx.controls</arg>
++              </compilerArgs>
++            </configuration>
++          </plugin>
++        </plugins>
++      </build>
++    </profile>
++  </profiles>
++
  </project>
diff --cc pom.xml
index d0ce842,d0ce842..9989505
--- a/pom.xml
+++ b/pom.xml
@@@ -26,9 -26,9 +26,10 @@@
       Apache SIS build requires Java 11 or higher, but compiled files can be executed on
Java 8.
       Setting the SIS_DATA environment variable before build is optional but recommended.
  
--     Build development snapshot:    mvn clean install
--     Include EPSG database:         mvn install -Pnon-free
--     Run more extensive tests:      mvn test -Dorg.apache.sis.test.extensive=true
++     Build development snapshot:        mvn clean install
++     Include EPSG database:             mvn install -Pnon-free
++     Include JavaFX dependency (GPL):   mvn install -Pjavafx
++     Run more extensive tests:          mvn test -Dorg.apache.sis.test.extensive=true
       =============================================================================================
-->
  <project xmlns              = "http://maven.apache.org/POM/4.0.0"
           xmlns:xsi          = "http://www.w3.org/2001/XMLSchema-instance"
@@@ -579,7 -579,7 +580,8 @@@
      <maven.compiler.source>8</maven.compiler.source>
      <maven.compiler.target>8</maven.compiler.target>
      <sis.plugin.version>${project.version}</sis.plugin.version>
--    <sis.non-free.version>1.0</sis.non-free.version>                 <!--
Used only if "non-free" profile is enabled. -->
++    <sis.non-free.version>1.0</sis.non-free.version>                <!--
Used only if "non-free" profile is activated. -->
++    <javafx.version>14.0.1</javafx.version>                         <!--
Used only if "javafx" profile is activated. -->
      <geoapi.version>4.0-SNAPSHOT</geoapi.version>
      <jaxb.version>2.3.2</jaxb.version>
    </properties>


Mime
View raw message