Author: desruisseaux
Date: Wed Sep 3 14:12:00 2025
New Revision: 1928203
Log:
Upgrade to SIS 1.5-RC1.
Modified:
sis/release-test/maven/pom.xml
sis/release-test/maven/src/main/java/org/apache/sis/test/referencing/CoordinateOperationComparator.java
Modified: sis/release-test/maven/pom.xml
==============================================================================
--- sis/release-test/maven/pom.xml Wed Sep 3 12:45:02 2025
(r1928202)
+++ sis/release-test/maven/pom.xml Wed Sep 3 14:12:00 2025
(r1928203)
@@ -27,7 +27,7 @@
<groupId>org.apache.sis.test</groupId>
<artifactId>maven</artifactId>
- <version>1.4</version>
+ <version>1.5</version>
<packaging>jar</packaging>
<name>Test of Maven dependencies</name>
@@ -46,7 +46,6 @@
<properties>
<sis.version>${project.version}</sis.version>
- <sis-nonfree.version>${project.version}</sis-nonfree.version> <!--
Release cycle may differ from core Apache SIS. -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
@@ -62,22 +61,17 @@
<repository>
<id>sis.staging.parent</id>
<name>SIS staging repository of Parent POM</name>
-
<url>https://repository.apache.org/content/repositories/orgapachesis-1043</url>
+
<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-1049</url>
+
<url>https://repository.apache.org/content/repositories/orgapachesis-1056</url>
</repository>
<repository>
- <id>sis.staging.non-free</id>
- <name>SIS staging repository of non-free resources</name>
-
<url>https://repository.apache.org/content/repositories/orgapachesis-1050</url>
- </repository>
- <repository>
- <id>UCAR</id>
- <name>UCAR repository</name>
-
<url>https://artifacts.unidata.ucar.edu/content/repositories/unidata-releases</url>
+ <id>unidata-all</id>
+ <name>Unidata All</name>
+ <url>https://artifacts.unidata.ucar.edu/repository/unidata-all</url>
</repository>
</repositories>
@@ -150,13 +144,7 @@
<dependency>
<groupId>org.apache.sis.non-free</groupId>
<artifactId>sis-epsg</artifactId>
- <version>${sis-nonfree.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.sis.non-free</groupId>
- <artifactId>sis-embedded-data</artifactId>
- <version>${sis-nonfree.version}</version>
+ <version>${sis.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -165,9 +153,21 @@
<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.10.0</version>
+ <version>5.13.4</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -177,12 +177,12 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.11.0</version>
+ <version>3.14.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.1.2</version>
+ <version>3.5.3</version>
<configuration>
<systemProperties>
<property>
Modified:
sis/release-test/maven/src/main/java/org/apache/sis/test/referencing/CoordinateOperationComparator.java
==============================================================================
---
sis/release-test/maven/src/main/java/org/apache/sis/test/referencing/CoordinateOperationComparator.java
Wed Sep 3 12:45:02 2025 (r1928202)
+++
sis/release-test/maven/src/main/java/org/apache/sis/test/referencing/CoordinateOperationComparator.java
Wed Sep 3 14:12:00 2025 (r1928203)
@@ -36,12 +36,14 @@ import org.apache.sis.referencing.CRS;
import org.apache.sis.referencing.IdentifiedObjects;
import org.apache.sis.referencing.crs.AbstractCRS;
import org.apache.sis.referencing.cs.AxesConvention;
-import org.apache.sis.metadata.internal.ReferencingServices;
-import org.apache.sis.util.internal.StandardDateFormat;
-import org.apache.sis.referencing.util.Formulas;
import org.apache.sis.io.TableAppender;
import org.apache.sis.math.Statistics;
+// Non-public API used only for testing purposes.
+import org.apache.sis.metadata.privy.ReferencingServices;
+import org.apache.sis.referencing.privy.Formulas;
+import org.apache.sis.util.privy.Constants;
+
/**
* Compares coordinate operations performed with Apache SIS and {@literal
Proj.4}.
@@ -387,9 +389,9 @@ public class CoordinateOperationComparat
inverse.transform(outputs, 0, outputs, 0, numPts);
final long t2 = System.nanoTime();
collectDifferences(drift);
- final double tf = (t1 - t0) / (double)
StandardDateFormat.NANOS_PER_MILLISECOND;
- final double ti = (t2 - t1) / (double)
StandardDateFormat.NANOS_PER_MILLISECOND;
- final double tc = (t2 - t0) / (double)
StandardDateFormat.NANOS_PER_MILLISECOND;
+ final double tf = (t1 - t0) / (double)
Constants.NANOS_PER_MILLISECOND;
+ final double ti = (t2 - t1) / (double)
Constants.NANOS_PER_MILLISECOND;
+ final double tc = (t2 - t0) / (double)
Constants.NANOS_PER_MILLISECOND;
if (n != 0 && immediate) ((Flushable) table).flush();
table.append(String.format("%g\t%g\t%g\t%g\t%g\t%g%n",
@@ -435,9 +437,9 @@ public class CoordinateOperationComparat
ti += (t2 - t1);
tc += (t2 - t0);
}
- forwardTime .accept(tf / (double)
StandardDateFormat.NANOS_PER_MILLISECOND);
- inverseTime .accept(ti / (double)
StandardDateFormat.NANOS_PER_MILLISECOND);
- cumulatedTime.accept(tc / (double)
StandardDateFormat.NANOS_PER_MILLISECOND);
+ forwardTime .accept(tf / (double)
Constants.NANOS_PER_MILLISECOND);
+ inverseTime .accept(ti / (double)
Constants.NANOS_PER_MILLISECOND);
+ cumulatedTime.accept(tc / (double)
Constants.NANOS_PER_MILLISECOND);
}
if (!first && immediate) ((Flushable) table).flush();
table.append(String.format("%d\t%g\t%g\t%g\t%g\t%g\t%g\n", size,
