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 2224f8d344f4e38ee3f029b75268f328f4ab06e6 Author: Martin Desruisseaux <[email protected]> AuthorDate: Sun May 14 16:44:20 2023 +0200 Remove the activation of `sis-javafx` module by the `PATH_TO_FX` property and remove all dependencies of type "test-jar" because those two features are not compatible with Jigsaw modularization in the context of a Maven project. As a consequence, tests do not compile anymore and Maven must be executed as below: mvn install -Dmaven.test.skip=true Tests will be re-enabled after migration to Gradle. --- application/pom.xml | 12 ------- application/sis-console/pom.xml | 14 -------- application/sis-javafx/pom.xml | 51 ----------------------------- cloud/pom.xml | 7 ---- core/sis-cql/pom.xml | 9 ----- core/sis-feature/pom.xml | 23 ------------- core/sis-metadata/pom.xml | 7 ---- core/sis-portrayal/pom.xml | 28 ---------------- core/sis-referencing-by-identifiers/pom.xml | 21 ------------ core/sis-referencing/pom.xml | 14 -------- pom.xml | 7 ---- profiles/pom.xml | 7 ---- profiles/sis-french-profile/pom.xml | 7 ---- storage/pom.xml | 7 ---- storage/sis-geotiff/pom.xml | 7 ---- storage/sis-netcdf/pom.xml | 21 ------------ storage/sis-sqlstore/pom.xml | 14 -------- storage/sis-storage/pom.xml | 14 -------- storage/sis-xmlstore/pom.xml | 7 ---- 19 files changed, 277 deletions(-) diff --git a/application/pom.xml b/application/pom.xml index d3d1d3f59d..01706d3d80 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -101,13 +101,6 @@ <groupId>org.opengis</groupId> <artifactId>geoapi-conformance</artifactId> </dependency> - <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-utility</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> </dependencies> @@ -124,11 +117,6 @@ <profiles> <profile> <id>javafx</id> - <activation> - <property> - <name>env.PATH_TO_FX</name> - </property> - </activation> <modules> <module>sis-javafx</module> </modules> diff --git a/application/sis-console/pom.xml b/application/sis-console/pom.xml index 1a2a8de793..9230aacb19 100644 --- a/application/sis-console/pom.xml +++ b/application/sis-console/pom.xml @@ -127,20 +127,6 @@ </dependency> <!-- Test dependencies --> - <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-metadata</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.sis.storage</groupId> - <artifactId>sis-xmlstore</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> <dependency> <groupId>org.glassfish.jaxb</groupId> <artifactId>jaxb-runtime</artifactId> diff --git a/application/sis-javafx/pom.xml b/application/sis-javafx/pom.xml index 288e90bd76..e03cdcc31c 100644 --- a/application/sis-javafx/pom.xml +++ b/application/sis-javafx/pom.xml @@ -178,15 +178,6 @@ <artifactId>derbytools</artifactId> <scope>runtime</scope> </dependency> - - <!-- Test dependencies --> - <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-feature</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> </dependencies> <profiles> @@ -239,48 +230,6 @@ </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,javafx.web</arg> - </compilerArgs> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine> - --module-path ${env.PATH_TO_FX} --add-modules javafx.graphics,javafx.controls,javafx.web - </argLine> - </configuration> - </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <additionalJOptions> - <additionalJOption>--module-path</additionalJOption> - <additionalJOption>${env.PATH_TO_FX}</additionalJOption> - <additionalJOption>--add-modules</additionalJOption> - <additionalJOption>javafx.graphics,javafx.controls,javafx.web</additionalJOption> - </additionalJOptions> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <!-- Because the EPSG database is not free, require the user to ask it explicitly. --> <profile> <id>non-free</id> diff --git a/cloud/pom.xml b/cloud/pom.xml index 4062f17c4b..8827e1e2ab 100644 --- a/cloud/pom.xml +++ b/cloud/pom.xml @@ -102,13 +102,6 @@ <groupId>org.opengis</groupId> <artifactId>geoapi-conformance</artifactId> </dependency> - <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-utility</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> </dependencies> diff --git a/core/sis-cql/pom.xml b/core/sis-cql/pom.xml index 11adde30f0..8aabe3a2d3 100644 --- a/core/sis-cql/pom.xml +++ b/core/sis-cql/pom.xml @@ -131,15 +131,6 @@ <version>4.11.1</version> <scope>compile</scope> </dependency> - - <!-- Test dependencies --> - <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-utility</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> </dependencies> </project> diff --git a/core/sis-feature/pom.xml b/core/sis-feature/pom.xml index 301e441da1..1123514a07 100644 --- a/core/sis-feature/pom.xml +++ b/core/sis-feature/pom.xml @@ -162,29 +162,6 @@ <artifactId>jts-core</artifactId> <optional>true</optional> </dependency> - - <!-- Test dependencies --> - <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-utility</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-metadata</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-referencing</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> </dependencies> </project> diff --git a/core/sis-metadata/pom.xml b/core/sis-metadata/pom.xml index 013bb1633a..808a4c60bb 100644 --- a/core/sis-metadata/pom.xml +++ b/core/sis-metadata/pom.xml @@ -147,13 +147,6 @@ </dependency> <!-- Test dependencies --> - <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-utility</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> <dependency> <groupId>org.glassfish.jaxb</groupId> <artifactId>jaxb-runtime</artifactId> diff --git a/core/sis-portrayal/pom.xml b/core/sis-portrayal/pom.xml index d599f2e4fe..4d07f5a983 100644 --- a/core/sis-portrayal/pom.xml +++ b/core/sis-portrayal/pom.xml @@ -118,34 +118,6 @@ <artifactId>jts-core</artifactId> <optional>true</optional> </dependency> - - <!-- Test dependencies --> - <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-utility</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-metadata</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-referencing</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.glassfish.jaxb</groupId> - <artifactId>jaxb-runtime</artifactId> - <scope>test</scope> - </dependency> </dependencies> </project> diff --git a/core/sis-referencing-by-identifiers/pom.xml b/core/sis-referencing-by-identifiers/pom.xml index 13e7fedd3c..8736880187 100644 --- a/core/sis-referencing-by-identifiers/pom.xml +++ b/core/sis-referencing-by-identifiers/pom.xml @@ -118,27 +118,6 @@ </dependency> <!-- Test dependencies --> - <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-utility</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-metadata</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-referencing</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> diff --git a/core/sis-referencing/pom.xml b/core/sis-referencing/pom.xml index 8584a8373e..4a4bdbe904 100644 --- a/core/sis-referencing/pom.xml +++ b/core/sis-referencing/pom.xml @@ -145,20 +145,6 @@ <artifactId>GeographicLib-Java</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-utility</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-metadata</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> <dependency> <groupId>org.glassfish.jaxb</groupId> <artifactId>jaxb-runtime</artifactId> diff --git a/pom.xml b/pom.xml index 050a44408c..e9487aad3c 100644 --- a/pom.xml +++ b/pom.xml @@ -747,13 +747,6 @@ </archive> <skipIfEmpty>true</skipIfEmpty> </configuration> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> </plugin> <!-- Set "*-source-release.zip" filename prefix to "sis-*" instead of "parent-*" --> diff --git a/profiles/pom.xml b/profiles/pom.xml index 610c41295b..30b836c528 100644 --- a/profiles/pom.xml +++ b/profiles/pom.xml @@ -102,13 +102,6 @@ <groupId>org.opengis</groupId> <artifactId>geoapi-conformance</artifactId> </dependency> - <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-utility</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> </dependencies> diff --git a/profiles/sis-french-profile/pom.xml b/profiles/sis-french-profile/pom.xml index d4c8b2f650..efcfb9f857 100644 --- a/profiles/sis-french-profile/pom.xml +++ b/profiles/sis-french-profile/pom.xml @@ -116,13 +116,6 @@ </dependency> <!-- Test dependencies --> - <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-metadata</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> <dependency> <groupId>org.glassfish.jaxb</groupId> <artifactId>jaxb-runtime</artifactId> diff --git a/storage/pom.xml b/storage/pom.xml index 4287379b06..b17a47bbd1 100644 --- a/storage/pom.xml +++ b/storage/pom.xml @@ -154,13 +154,6 @@ <artifactId>derbytools</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-utility</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> </dependencies> diff --git a/storage/sis-geotiff/pom.xml b/storage/sis-geotiff/pom.xml index 9453689d67..a567b35118 100644 --- a/storage/sis-geotiff/pom.xml +++ b/storage/sis-geotiff/pom.xml @@ -125,13 +125,6 @@ <artifactId>sis-storage</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.sis.storage</groupId> - <artifactId>sis-storage</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> <dependency> <groupId>org.glassfish.jaxb</groupId> <artifactId>jaxb-runtime</artifactId> diff --git a/storage/sis-netcdf/pom.xml b/storage/sis-netcdf/pom.xml index c6e6440398..8cad79a294 100644 --- a/storage/sis-netcdf/pom.xml +++ b/storage/sis-netcdf/pom.xml @@ -122,27 +122,6 @@ </dependency> <!-- Leverage GeoAPI tests. --> - <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-referencing</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.sis.storage</groupId> - <artifactId>sis-storage</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-metadata</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> <dependency> <groupId>org.slf4j</groupId> <!-- For UCAR library. --> <artifactId>slf4j-jdk14</artifactId> diff --git a/storage/sis-sqlstore/pom.xml b/storage/sis-sqlstore/pom.xml index 1e1b16d0a7..ced6d6b1c3 100644 --- a/storage/sis-sqlstore/pom.xml +++ b/storage/sis-sqlstore/pom.xml @@ -110,20 +110,6 @@ <artifactId>sis-storage</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-metadata</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-referencing</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> <dependency> <groupId>org.apache.derby</groupId> <artifactId>derby</artifactId> diff --git a/storage/sis-storage/pom.xml b/storage/sis-storage/pom.xml index f42705f6bc..0ea3713131 100644 --- a/storage/sis-storage/pom.xml +++ b/storage/sis-storage/pom.xml @@ -128,20 +128,6 @@ </dependency> <!-- Test dependencies --> - <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-metadata</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-referencing</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> <dependency> <groupId>com.esri.geometry</groupId> <artifactId>esri-geometry-api</artifactId> diff --git a/storage/sis-xmlstore/pom.xml b/storage/sis-xmlstore/pom.xml index 6bc38b677e..11a6c5786a 100644 --- a/storage/sis-xmlstore/pom.xml +++ b/storage/sis-xmlstore/pom.xml @@ -120,13 +120,6 @@ </dependency> <!-- Test dependencies --> - <dependency> - <groupId>org.apache.sis.core</groupId> - <artifactId>sis-metadata</artifactId> - <version>${project.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> <dependency> <groupId>org.glassfish.jaxb</groupId> <artifactId>jaxb-runtime</artifactId>
