Author: desruisseaux
Date: Thu Sep 30 09:39:18 2021
New Revision: 1893749
URL: http://svn.apache.org/viewvc?rev=1893749&view=rev
Log:
Upgrade the tests to SIS 1.1.
Added:
sis/release-test/maven/src/main/java/org/apache/sis/test/referencing/Proj4.java
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/IntegrationTest.java
Modified: sis/release-test/maven/pom.xml
URL:
http://svn.apache.org/viewvc/sis/release-test/maven/pom.xml?rev=1893749&r1=1893748&r2=1893749&view=diff
==============================================================================
--- sis/release-test/maven/pom.xml (original)
+++ sis/release-test/maven/pom.xml Thu Sep 30 09:39:18 2021
@@ -27,7 +27,7 @@
<groupId>org.apache.sis.test</groupId>
<artifactId>maven</artifactId>
- <version>1.0</version>
+ <version>1.1</version>
<packaging>jar</packaging>
<name>Release candidate test</name>
@@ -46,7 +46,7 @@
<properties>
<sis.version>${project.version}</sis.version>
- <sis-nonfree.version>1.0</sis-nonfree.version> <!-- Release cycle may
differ from core Apache SIS. -->
+ <sis-nonfree.version>1.1</sis-nonfree.version> <!-- Release cycle may
differ from core Apache SIS. -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -140,7 +140,7 @@
</dependency>
<dependency>
<groupId>org.apache.sis.storage</groupId>
- <artifactId>sis-gdal</artifactId>
+ <artifactId>sis-sqlstore</artifactId>
<version>${sis.version}</version>
</dependency>
<dependency>
@@ -151,7 +151,7 @@
</dependency>
<dependency>
<groupId>edu.ucar</groupId>
- <artifactId>cdm</artifactId>
+ <artifactId>cdm-core</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -241,7 +241,7 @@
</dependency>
<dependency>
<groupId>org.apache.sis.storage</groupId>
- <artifactId>sis-gdal</artifactId>
+ <artifactId>sis-sqlstore</artifactId>
<version>${sis.version}</version>
<type>test-jar</type>
<scope>test</scope>
@@ -309,7 +309,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.2</version>
+ <version>3.0.0-M5</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=1893749&r1=1893748&r2=1893749&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] Thu Sep 30 09:39:18 2021
@@ -41,7 +41,6 @@ import org.apache.sis.internal.util.Stan
import org.apache.sis.internal.referencing.Formulas;
import org.apache.sis.io.TableAppender;
import org.apache.sis.math.Statistics;
-import org.apache.sis.storage.gdal.Proj4;
/**
Added:
sis/release-test/maven/src/main/java/org/apache/sis/test/referencing/Proj4.java
URL:
http://svn.apache.org/viewvc/sis/release-test/maven/src/main/java/org/apache/sis/test/referencing/Proj4.java?rev=1893749&view=auto
==============================================================================
---
sis/release-test/maven/src/main/java/org/apache/sis/test/referencing/Proj4.java
(added)
+++
sis/release-test/maven/src/main/java/org/apache/sis/test/referencing/Proj4.java
Thu Sep 30 09:39:18 2021
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sis.test.referencing;
+
+import org.opengis.referencing.crs.CoordinateReferenceSystem;
+import org.opengis.referencing.operation.CoordinateOperation;
+
+
+/**
+ * Placeholder for methods from the "sis-gdal" module, which has been deleted
in Apache SIS 1.1 release.
+ * The "sis-gdal" module has been deleted because it should be replaced by the
PROJ-JNI project.
+ * 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() {
+ }
+
+ static CoordinateReferenceSystem createCRS(String def, int dimension) {
+ throw new UnsupportedOperationException("To be replaced by PROJ-JNI.");
+ }
+
+ static CoordinateOperation createOperation(CoordinateReferenceSystem
source, CoordinateReferenceSystem target, boolean b) {
+ throw new UnsupportedOperationException("To be replaced by PROJ-JNI.");
+ }
+}
Modified:
sis/release-test/maven/src/test/java/org/apache/sis/test/IntegrationTest.java
URL:
http://svn.apache.org/viewvc/sis/release-test/maven/src/test/java/org/apache/sis/test/IntegrationTest.java?rev=1893749&r1=1893748&r2=1893749&view=diff
==============================================================================
---
sis/release-test/maven/src/test/java/org/apache/sis/test/IntegrationTest.java
[UTF-8] (original)
+++
sis/release-test/maven/src/test/java/org/apache/sis/test/IntegrationTest.java
[UTF-8] Thu Sep 30 09:39:18 2021
@@ -31,13 +31,12 @@ import org.junit.runners.Suite;
org.apache.sis.test.suite.ReferencingTestSuite.class,
org.apache.sis.test.suite.ReferencingByIdentifiersTestSuite.class,
org.apache.sis.test.suite.FeatureTestSuite.class,
-// org.apache.sis.test.suite.RasterTestSuite.class,
org.apache.sis.test.suite.StorageTestSuite.class,
org.apache.sis.test.suite.NetcdfTestSuite.class,
org.apache.sis.test.suite.GPXTestSuite.class,
org.apache.sis.test.suite.GeoTiffTestSuite.class,
org.apache.sis.test.suite.EarthObservationTestSuite.class,
- org.apache.sis.test.suite.GDALTestSuite.class
+ org.apache.sis.test.suite.SQLTestSuite.class
})
public final strictfp class IntegrationTest extends TestSuite {
/**
