Author: desruisseaux
Date: Sat Oct 7 13:38:53 2023
New Revision: 1912784
URL: http://svn.apache.org/viewvc?rev=1912784&view=rev
Log:
Test project for SIS 1.4-RC1
Modified:
sis/release-test/maven/pom.xml
sis/release-test/maven/src/main/java/org/apache/sis/test/referencing/CoordinateOperationComparator.java
sis/release-test/maven/src/test/java/org/apache/sis/test/SelfConsistencyTest.java
Modified: sis/release-test/maven/pom.xml
URL:
http://svn.apache.org/viewvc/sis/release-test/maven/pom.xml?rev=1912784&r1=1912783&r2=1912784&view=diff
==============================================================================
--- sis/release-test/maven/pom.xml (original)
+++ sis/release-test/maven/pom.xml Sat Oct 7 13:38:53 2023
@@ -27,14 +27,14 @@
<groupId>org.apache.sis.test</groupId>
<artifactId>maven</artifactId>
- <version>1.4-SNAPSHOT</version>
+ <version>1.4</version>
<packaging>jar</packaging>
<name>Test of Maven dependencies</name>
<url>https://sis.apache.org</url>
<description>
- Test the Apache SIS release candidate on the staging repository.
- Testers need to edit the URL of the 'sis.staging' repository below.
+ 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.
@@ -48,6 +48,8 @@
<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>
</properties>
<scm>
@@ -58,9 +60,19 @@
<repositories>
<repository>
- <id>sis.staging</id>
- <name>SIS staging repository</name>
-
<url>https://repository.apache.org/content/repositories/orgapachesis-1039</url>
+ <id>sis.staging.parent</id>
+ <name>SIS staging repository of Parent POM</name>
+
<url>https://repository.apache.org/content/repositories/orgapachesis-1043</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>
+ </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>
@@ -69,19 +81,6 @@
</repository>
</repositories>
- <!-- Inherit the JUnit version number from the SIS project. -->
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.sis</groupId>
- <artifactId>parent</artifactId>
- <version>${sis.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.apache.sis.core</groupId>
@@ -139,14 +138,25 @@
<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-nonfree.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>edu.ucar</groupId>
- <artifactId>cdm-core</artifactId>
+ <groupId>org.apache.sis.non-free</groupId>
+ <artifactId>sis-embedded-data</artifactId>
+ <version>${sis-nonfree.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -154,59 +164,10 @@
<artifactId>sis-console</artifactId>
<version>${sis.version}</version>
</dependency>
-
- <!-- Test dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opengis</groupId>
- <artifactId>geoapi-conformance</artifactId>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>gov.nist.math</groupId>
- <artifactId>jama</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.locationtech.jts</groupId>
- <artifactId>jts-core</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>com.esri.geometry</groupId>
- <artifactId>esri-geometry-api</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
- <groupId>net.sf.geographiclib</groupId>
- <artifactId>GeographicLib-Java</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>5.10.0</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -216,12 +177,12 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.10.1</version>
+ <version>3.11.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.0.0-M7</version>
+ <version>3.1.2</version>
<configuration>
<systemProperties>
<property>
Modified:
sis/release-test/maven/src/main/java/org/apache/sis/test/referencing/CoordinateOperationComparator.java
URL:
http://svn.apache.org/viewvc/sis/release-test/maven/src/main/java/org/apache/sis/test/referencing/CoordinateOperationComparator.java?rev=1912784&r1=1912783&r2=1912784&view=diff
==============================================================================
---
sis/release-test/maven/src/main/java/org/apache/sis/test/referencing/CoordinateOperationComparator.java
[UTF-8] (original)
+++
sis/release-test/maven/src/main/java/org/apache/sis/test/referencing/CoordinateOperationComparator.java
[UTF-8] Sat Oct 7 13:38:53 2023
@@ -36,9 +36,9 @@ 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.internal.metadata.ReferencingServices;
-import org.apache.sis.internal.util.StandardDateFormat;
-import org.apache.sis.internal.referencing.Formulas;
+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;
Modified:
sis/release-test/maven/src/test/java/org/apache/sis/test/SelfConsistencyTest.java
URL:
http://svn.apache.org/viewvc/sis/release-test/maven/src/test/java/org/apache/sis/test/SelfConsistencyTest.java?rev=1912784&r1=1912783&r2=1912784&view=diff
==============================================================================
---
sis/release-test/maven/src/test/java/org/apache/sis/test/SelfConsistencyTest.java
(original)
+++
sis/release-test/maven/src/test/java/org/apache/sis/test/SelfConsistencyTest.java
Sat Oct 7 13:38:53 2023
@@ -20,9 +20,9 @@ import org.opengis.referencing.crs.Coord
import org.opengis.util.FactoryException;
import org.apache.sis.referencing.CRS;
import org.apache.sis.util.Utilities;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
/**
