Author: desruisseaux
Date: Mon Sep 29 21:31:25 2025
New Revision: 1928849
Log:
Restructure the "SIS tests" Maven project as a group of sub-projects.
The intent is to have sub-projects testing different dependency sets:
`sis-epsg` versus `sis-embedded-data`, classpath versus module-path.
Added:
sis/release-test/maven/with-epsg/ (props changed)
sis/release-test/maven/with-epsg/pom.xml
- copied, changed from r1928838, sis/release-test/maven/pom.xml
sis/release-test/maven/with-epsg/src/
- copied from r1928848, sis/release-test/maven/src/
Deleted:
sis/release-test/maven/src/
Modified:
sis/release-test/maven/pom.xml
sis/release-test/maven/with-epsg/src/main/java/org/apache/sis/test/referencing/CoordinateOperationComparator.java
sis/release-test/maven/with-epsg/src/main/java/org/apache/sis/test/referencing/Proj4.java
(contents, props changed)
sis/release-test/maven/with-epsg/src/main/java/org/apache/sis/test/referencing/package-info.java
sis/release-test/maven/with-epsg/src/test/java/org/apache/sis/test/SelfConsistencyTest.java
(props changed)
Modified: sis/release-test/maven/pom.xml
==============================================================================
--- sis/release-test/maven/pom.xml Mon Sep 29 20:10:02 2025
(r1928848)
+++ sis/release-test/maven/pom.xml Mon Sep 29 21:31:25 2025
(r1928849)
@@ -28,13 +28,13 @@
<groupId>org.apache.sis.test</groupId>
<artifactId>maven</artifactId>
<version>1.5</version>
- <packaging>jar</packaging>
+ <packaging>pom</packaging>
- <name>Test of Maven dependencies</name>
+ <name>Test Apache SIS as Maven dependencies</name>
<url>https://sis.apache.org</url>
<description>
Test the Apache SIS release candidate on the staging repositories.
- Testers need to edit the URL of each 'sis.staging' repository below.
+ Testers need to edit the URL of each `sis.staging` repository below.
The URL is given by the release manager when a release candidate is
submitted. Typically, only the three last digits need to be updated.
@@ -77,82 +77,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.sis.core</groupId>
- <artifactId>sis-utility</artifactId>
- <version>${sis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sis.core</groupId>
- <artifactId>sis-metadata</artifactId>
- <version>${sis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sis.core</groupId>
- <artifactId>sis-referencing</artifactId>
- <version>${sis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sis.core</groupId>
- <artifactId>sis-referencing-by-identifiers</artifactId>
- <version>${sis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sis.core</groupId>
- <artifactId>sis-feature</artifactId>
- <version>${sis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sis.storage</groupId>
- <artifactId>sis-storage</artifactId>
- <version>${sis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sis.storage</groupId>
- <artifactId>sis-netcdf</artifactId>
- <version>${sis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sis.storage</groupId>
- <artifactId>sis-xmlstore</artifactId>
- <version>${sis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sis.storage</groupId>
- <artifactId>sis-geotiff</artifactId>
- <version>${sis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sis.storage</groupId>
- <artifactId>sis-earth-observation</artifactId>
- <version>${sis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sis.storage</groupId>
- <artifactId>sis-sqlstore</artifactId>
- <version>${sis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sis.profiles</groupId>
- <artifactId>sis-french-profile</artifactId>
- <version>${sis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sis.profiles</groupId>
- <artifactId>sis-japan-profile</artifactId>
- <version>${sis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sis.non-free</groupId>
- <artifactId>sis-epsg</artifactId>
- <version>${sis.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sis.application</groupId>
- <artifactId>sis-console</artifactId>
- <version>${sis.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
<version>10.15.2.0</version>
@@ -182,7 +106,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.5.3</version>
+ <version>3.5.4</version>
<configuration>
<systemProperties>
<property>
@@ -190,8 +114,15 @@
<value>${project.build.directory}/derby.log</value>
</property>
</systemProperties>
+ <environmentVariables>
+ <SIS_DATA>${project.build.directory}</SIS_DATA>
+ </environmentVariables>
</configuration>
</plugin>
</plugins>
</build>
+
+ <modules>
+ <module>with-epsg</module>
+ </modules>
</project>
Copied and modified: sis/release-test/maven/with-epsg/pom.xml (from r1928838,
sis/release-test/maven/pom.xml)
==============================================================================
--- sis/release-test/maven/pom.xml Mon Sep 29 13:58:39 2025
(r1928838, copy source)
+++ sis/release-test/maven/with-epsg/pom.xml Mon Sep 29 21:31:25 2025
(r1928849)
@@ -24,57 +24,22 @@
xsi:schemaLocation = "http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.sis.test</groupId>
+ <artifactId>maven</artifactId>
+ <version>1.5</version>
+ </parent>
<groupId>org.apache.sis.test</groupId>
- <artifactId>maven</artifactId>
- <version>1.5</version>
+ <artifactId>with-epsg</artifactId>
<packaging>jar</packaging>
- <name>Test of Maven dependencies</name>
- <url>https://sis.apache.org</url>
+ <name>Test SIS with EPSG installation script</name>
<description>
- Test the Apache SIS release candidate on the staging repositories.
- Testers need to edit the URL of each 'sis.staging' repository below.
- The URL is given by the release manager when a release candidate is
- submitted. Typically, only the three last digits need to be updated.
-
- Next, testers need to recursively delete the Apache SIS artifacts
- from their local repository (~/.m2/repository/org/apache/sis), in
- order to ensure that the tested JAR files are the ones downloaded
- from the staging repository.
+ A project with almost all Apache SIS dependencies, for testing the
integrity of downloaded files.
+ The connection to the EPSG database is done by `sis-epsg`, which installs
a local copy of the database.
</description>
- <properties>
- <sis.version>${project.version}</sis.version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>17</maven.compiler.source>
- <maven.compiler.target>17</maven.compiler.target>
- </properties>
-
- <scm>
- <url>http://svn.apache.org/viewvc/sis/release-test/maven</url>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/sis/release-test/maven</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/sis/release-test/maven</developerConnection>
- </scm>
-
- <repositories>
- <repository>
- <id>sis.staging.parent</id>
- <name>SIS staging repository of Parent POM</name>
-
<url>https://repository.apache.org/content/repositories/orgapachesis-1055</url>
- </repository>
- <repository>
- <id>sis.staging.main</id>
- <name>SIS staging repository of main artifacts</name>
-
<url>https://repository.apache.org/content/repositories/orgapachesis-1060</url>
- </repository>
- <repository>
- <id>unidata-all</id>
- <name>Unidata All</name>
- <url>https://artifacts.unidata.ucar.edu/repository/unidata-all</url>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.apache.sis.core</groupId>
@@ -152,46 +117,5 @@
<artifactId>sis-console</artifactId>
<version>${sis.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.15.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>10.15.2.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter</artifactId>
- <version>5.13.4</version>
- <scope>test</scope>
- </dependency>
</dependencies>
-
- <!-- Send Derby logging file to target directory. -->
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.14.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>3.5.3</version>
- <configuration>
- <systemProperties>
- <property>
- <name>derby.stream.error.file</name>
- <value>${project.build.directory}/derby.log</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified:
sis/release-test/maven/with-epsg/src/main/java/org/apache/sis/test/referencing/CoordinateOperationComparator.java
==============================================================================
---
sis/release-test/maven/src/main/java/org/apache/sis/test/referencing/CoordinateOperationComparator.java
Mon Sep 29 20:10:02 2025 (r1928848)
+++
sis/release-test/maven/with-epsg/src/main/java/org/apache/sis/test/referencing/CoordinateOperationComparator.java
Mon Sep 29 21:31:25 2025 (r1928849)
@@ -55,10 +55,9 @@ import org.apache.sis.util.internal.shar
* The {@code --tabs} option is for using tabulations as column separator
instead than formatted outputs.
* This make importation in spreadsheets easier.
*
+ * @todo This test is disabled because the binding to PROJ native library has
not yet been upgraded.
+ *
* @author Martin Desruisseaux (Geomatys)
- * @version 0.8
- * @since 0.8
- * @module
*/
public class CoordinateOperationComparator {
/**
Modified:
sis/release-test/maven/with-epsg/src/main/java/org/apache/sis/test/referencing/Proj4.java
==============================================================================
---
sis/release-test/maven/src/main/java/org/apache/sis/test/referencing/Proj4.java
Mon Sep 29 20:10:02 2025 (r1928848)
+++
sis/release-test/maven/with-epsg/src/main/java/org/apache/sis/test/referencing/Proj4.java
Mon Sep 29 21:31:25 2025 (r1928849)
@@ -26,9 +26,6 @@ import org.opengis.referencing.operation
* This class is temporary and will be deleted after transition to PROJ-JNI is
completed.
*
* @author Martin Desruisseaux (Geomatys)
- * @version 1.1
- * @since 1.1
- * @module
*/
final class Proj4 {
private Proj4() {
Modified:
sis/release-test/maven/with-epsg/src/main/java/org/apache/sis/test/referencing/package-info.java
==============================================================================
---
sis/release-test/maven/src/main/java/org/apache/sis/test/referencing/package-info.java
Mon Sep 29 20:10:02 2025 (r1928848)
+++
sis/release-test/maven/with-epsg/src/main/java/org/apache/sis/test/referencing/package-info.java
Mon Sep 29 21:31:25 2025 (r1928849)
@@ -16,11 +16,13 @@
*/
/**
- * Compares Apache SIS with other map projection libraries.
+ * Various operations for testing the Coordinate Reference Systems support.
+ * Includes:
+ *
+ * <ul>
+ * <li>Comparisons of Apache <abbr>SIS</abbr> with other map projection
libraries.</li>
+ * </ul>
*
* @author Martin Desruisseaux (Geomatys)
- * @version 0.8
- * @since 0.8
- * @module
*/
package org.apache.sis.test.referencing;
