diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 76ca13a3..fc2e10b0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,6 +12,13 @@ jobs: # pinned : gdal-bin comes from the distribution (GDAL 3.12.2 on ubuntu 26.04, as in the Dockerfile) runs-on: ubuntu-26.04 + # 17 : minimum supported version (gpu-site), 25 : version of the Docker image + strategy: + fail-fast: false + matrix: + java: [ '17', '25' ] + name: build (java ${{ matrix.java }}) + # PostGIS for the DGPR controls (skipped with SQLITE) services: postgis: @@ -34,7 +41,7 @@ jobs: - name: Set up java uses: actions/setup-java@v5 with: - java-version: '25' + java-version: ${{ matrix.java }} distribution: 'temurin' cache: maven diff --git a/CHANGELOG.md b/CHANGELOG.md index f2ca4a5b..04dbdccc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # CHANGELOG +## 4.7.x + +### v4.7.0 - Behavior changes + +* v4.7.0 - **Breaking change** : Java 17 or above is required to run `validator-cli.jar` (compiled for Java 17 instead of Java 11, `UnsupportedClassVersionError` with Java 11). Docker image and CI already use Java 25. + +### v4.7.0 - Dependencies and build + +* v4.7.0 - Bump GeoTools from 27.5 to 35.2 : `org.opengis` replaced by `org.geotools.api`, `DirectPosition` by `Position`. No output change on the CNIG / PCRS / DGPR test datasets (`document-info.json`, `validation.jsonl`, normalized data, reprojections in the 26 supported projections, with Java 17 and Java 21) +* v4.7.0 - CI : build and tests with Java 17 (minimum supported version) and Java 25 (Docker image) +* v4.7.0 - `validator-cli.jar` : 24.4 Mo to 26.3 Mo (newer EPSG database, `tools.jackson.core` required by GeoTools), Eclipse ImageN (image processing, replaces JAI in GeoTools) excluded from the jar + ## 4.6.x ### v4.6.0 - Behavior changes diff --git a/doc/cli.md b/doc/cli.md index b22cfefd..89888c0c 100644 --- a/doc/cli.md +++ b/doc/cli.md @@ -3,7 +3,7 @@ ## Pré-requis -* Exécutable java de OpenJDK 11 (`java --version` doit fonctionner et mentionner une version java 11 ou supérieure) +* Exécutable java de OpenJDK 17 (`java --version` doit fonctionner et mentionner une version java 17 ou supérieure) * Exécutable [ogr2ogr de GDAL](dependencies/ogr2ogr.md) (`ogr2ogr --version` doit fonctionner et mentionner une version supportée) ## Installation du validateur diff --git a/doc/dependencies/geotools.md b/doc/dependencies/geotools.md index 074b42fe..2de15e94 100644 --- a/doc/dependencies/geotools.md +++ b/doc/dependencies/geotools.md @@ -14,7 +14,9 @@ So, `gt-epsg-hsql` is used as `java -Dorg.geotools.referencing.forceXY=true` may ## Relation to java version -As the validator requires Java 11, GeoTools 21.x and above is supported. +The validator requires Java 17, as GeoTools 34 and above (GeoTools 33.x is the last series supporting Java 11). + +Since GeoTools 30, the `org.opengis` packages are replaced by `org.geotools.api` (ex : `org.geotools.api.referencing.crs.CoordinateReferenceSystem`), see [upgrade guide](https://docs.geotools.org/latest/userguide/welcome/upgrade.html). See [Geotools - Java Install](http://docs.geotools.org/latest/userguide/build/install/jdk.html#) for more details. diff --git a/doc/developpement.md b/doc/developpement.md index 03ccb15a..6b848f2b 100644 --- a/doc/developpement.md +++ b/doc/developpement.md @@ -6,7 +6,7 @@ Ce document décrit l'installation des dépendances, la compilation du projet et ### Java -Le projet compile avec **Java 11** (voir `java.version` dans `pom.xml`). L'exécution du validateur requiert **Java 17 ou supérieur** (voir [README.md](../README.md)). +Le projet compile pour **Java 17** (voir `java.version` dans `pom.xml`) et requiert **Java 17 ou supérieur** pour l'exécution (voir [README.md](../README.md)). Un JDK (et non un JRE) est nécessaire pour compiler (paquet `openjdk-17-jdk-headless` ou supérieur). ```bash java -version diff --git a/pom.xml b/pom.xml index 3c797093..8f20fc28 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ fr.ign.validator validator pom - 4.6.6-SNAPSHOT + 4.7.0-SNAPSHOT Validator @@ -19,12 +19,12 @@ UTF-8 - 11 + 17 - 27.5 + 35.2 2.26.1 2.23.0 2.23 diff --git a/validator-cli/pom.xml b/validator-cli/pom.xml index 43e90fad..c2be154a 100644 --- a/validator-cli/pom.xml +++ b/validator-cli/pom.xml @@ -3,7 +3,7 @@ fr.ign.validator validator - 4.6.6-SNAPSHOT + 4.7.0-SNAPSHOT validator-cli validator-cli @@ -59,10 +59,10 @@ - + - javax.media:jai_core + org.eclipse.imagen:* diff --git a/validator-core/pom.xml b/validator-core/pom.xml index f4a497ad..34f5fbd6 100644 --- a/validator-core/pom.xml +++ b/validator-core/pom.xml @@ -3,7 +3,7 @@ fr.ign.validator validator - 4.6.6-SNAPSHOT + 4.7.0-SNAPSHOT validator-core jar diff --git a/validator-core/src/main/java/fr/ign/validator/geometry/GeometryLength.java b/validator-core/src/main/java/fr/ign/validator/geometry/GeometryLength.java index 5d3a2778..94591d36 100644 --- a/validator-core/src/main/java/fr/ign/validator/geometry/GeometryLength.java +++ b/validator-core/src/main/java/fr/ign/validator/geometry/GeometryLength.java @@ -6,11 +6,11 @@ import org.geotools.geometry.jts.JTS; import org.geotools.referencing.CRS; import org.locationtech.jts.geom.Geometry; -import org.opengis.geometry.MismatchedDimensionException; -import org.opengis.referencing.FactoryException; -import org.opengis.referencing.crs.CoordinateReferenceSystem; -import org.opengis.referencing.operation.MathTransform; -import org.opengis.referencing.operation.TransformException; +import org.geotools.api.geometry.MismatchedDimensionException; +import org.geotools.api.referencing.FactoryException; +import org.geotools.api.referencing.crs.CoordinateReferenceSystem; +import org.geotools.api.referencing.operation.MathTransform; +import org.geotools.api.referencing.operation.TransformException; import fr.ign.validator.model.Projection; diff --git a/validator-core/src/main/java/fr/ign/validator/geometry/ProjectionTransform.java b/validator-core/src/main/java/fr/ign/validator/geometry/ProjectionTransform.java index ff0b3921..380b32b3 100644 --- a/validator-core/src/main/java/fr/ign/validator/geometry/ProjectionTransform.java +++ b/validator-core/src/main/java/fr/ign/validator/geometry/ProjectionTransform.java @@ -2,11 +2,11 @@ import org.geotools.geometry.jts.JTS; import org.geotools.referencing.CRS; -import org.opengis.geometry.MismatchedDimensionException; -import org.opengis.referencing.FactoryException; -import org.opengis.referencing.crs.CoordinateReferenceSystem; -import org.opengis.referencing.operation.MathTransform; -import org.opengis.referencing.operation.TransformException; +import org.geotools.api.geometry.MismatchedDimensionException; +import org.geotools.api.referencing.FactoryException; +import org.geotools.api.referencing.crs.CoordinateReferenceSystem; +import org.geotools.api.referencing.operation.MathTransform; +import org.geotools.api.referencing.operation.TransformException; import fr.ign.validator.exception.GeometryTransformException; import fr.ign.validator.model.Projection; diff --git a/validator-core/src/main/java/fr/ign/validator/info/DocumentInfoExtractor.java b/validator-core/src/main/java/fr/ign/validator/info/DocumentInfoExtractor.java index 2f459d0d..9d54bf98 100644 --- a/validator-core/src/main/java/fr/ign/validator/info/DocumentInfoExtractor.java +++ b/validator-core/src/main/java/fr/ign/validator/info/DocumentInfoExtractor.java @@ -10,9 +10,9 @@ import org.apache.logging.log4j.Marker; import org.apache.logging.log4j.MarkerManager; import org.locationtech.jts.geom.Envelope; -import org.opengis.geometry.MismatchedDimensionException; -import org.opengis.referencing.FactoryException; -import org.opengis.referencing.operation.TransformException; +import org.geotools.api.geometry.MismatchedDimensionException; +import org.geotools.api.referencing.FactoryException; +import org.geotools.api.referencing.operation.TransformException; import fr.ign.validator.Context; import fr.ign.validator.data.Document; diff --git a/validator-core/src/main/java/fr/ign/validator/model/Projection.java b/validator-core/src/main/java/fr/ign/validator/model/Projection.java index d0fb8635..bf5489f7 100644 --- a/validator-core/src/main/java/fr/ign/validator/model/Projection.java +++ b/validator-core/src/main/java/fr/ign/validator/model/Projection.java @@ -2,7 +2,7 @@ import org.apache.commons.lang3.StringUtils; import org.geotools.referencing.CRS; -import org.opengis.referencing.crs.CoordinateReferenceSystem; +import org.geotools.api.referencing.crs.CoordinateReferenceSystem; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/validator-core/src/test/java/fr/ign/validator/geometry/GeometryLengthTest.java b/validator-core/src/test/java/fr/ign/validator/geometry/GeometryLengthTest.java index 3d4d0e01..30e14cbd 100644 --- a/validator-core/src/test/java/fr/ign/validator/geometry/GeometryLengthTest.java +++ b/validator-core/src/test/java/fr/ign/validator/geometry/GeometryLengthTest.java @@ -9,9 +9,9 @@ import org.locationtech.jts.geom.Point; import org.locationtech.jts.geom.Polygon; import org.locationtech.jts.io.ParseException; -import org.opengis.geometry.MismatchedDimensionException; -import org.opengis.referencing.FactoryException; -import org.opengis.referencing.operation.TransformException; +import org.geotools.api.geometry.MismatchedDimensionException; +import org.geotools.api.referencing.FactoryException; +import org.geotools.api.referencing.operation.TransformException; import fr.ign.validator.model.Projection; diff --git a/validator-core/src/test/java/fr/ign/validator/geometry/GeotoolsLonLatBehaviorTest.java b/validator-core/src/test/java/fr/ign/validator/geometry/GeotoolsLonLatBehaviorTest.java index 11586413..c3e69678 100644 --- a/validator-core/src/test/java/fr/ign/validator/geometry/GeotoolsLonLatBehaviorTest.java +++ b/validator-core/src/test/java/fr/ign/validator/geometry/GeotoolsLonLatBehaviorTest.java @@ -1,12 +1,12 @@ package fr.ign.validator.geometry; -import org.geotools.geometry.DirectPosition2D; +import org.geotools.geometry.Position2D; import org.geotools.referencing.CRS; import org.junit.Assert; import org.junit.Test; -import org.opengis.geometry.DirectPosition; -import org.opengis.referencing.crs.CoordinateReferenceSystem; -import org.opengis.referencing.operation.MathTransform; +import org.geotools.api.geometry.Position; +import org.geotools.api.referencing.crs.CoordinateReferenceSystem; +import org.geotools.api.referencing.operation.MathTransform; /** * Test geotools behavior with lat,lon order for EPSG codes. @@ -26,8 +26,8 @@ public void test4326toCRS84() throws Exception { CoordinateReferenceSystem targetCRS = CRS.decode("EPSG:4326"); MathTransform transform = CRS.findMathTransform(sourceCRS, targetCRS); - DirectPosition position = new DirectPosition2D(5.0, 45.0); - DirectPosition result = new DirectPosition2D(); + Position position = new Position2D(5.0, 45.0); + Position result = new Position2D(); transform.transform(position, result); Assert.assertEquals(45.0, result.getOrdinate(0), 0.1); Assert.assertEquals(5.0, result.getOrdinate(1), 0.1); diff --git a/validator-core/src/test/java/fr/ign/validator/model/type/GeometryTypeTest.java b/validator-core/src/test/java/fr/ign/validator/model/type/GeometryTypeTest.java index 4d8a7628..bafa3637 100644 --- a/validator-core/src/test/java/fr/ign/validator/model/type/GeometryTypeTest.java +++ b/validator-core/src/test/java/fr/ign/validator/model/type/GeometryTypeTest.java @@ -3,8 +3,8 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import org.opengis.referencing.FactoryException; -import org.opengis.referencing.NoSuchAuthorityCodeException; +import org.geotools.api.referencing.FactoryException; +import org.geotools.api.referencing.NoSuchAuthorityCodeException; import org.locationtech.jts.geom.Geometry; diff --git a/validator-core/src/test/java/fr/ign/validator/validation/database/AttributeReferenceValidatorTest.java b/validator-core/src/test/java/fr/ign/validator/validation/database/AttributeReferenceValidatorTest.java index 2b57a4ec..993b6b18 100644 --- a/validator-core/src/test/java/fr/ign/validator/validation/database/AttributeReferenceValidatorTest.java +++ b/validator-core/src/test/java/fr/ign/validator/validation/database/AttributeReferenceValidatorTest.java @@ -10,8 +10,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.opengis.referencing.FactoryException; -import org.opengis.referencing.NoSuchAuthorityCodeException; +import org.geotools.api.referencing.FactoryException; +import org.geotools.api.referencing.NoSuchAuthorityCodeException; import fr.ign.validator.Context; import fr.ign.validator.database.Database; diff --git a/validator-core/src/test/java/fr/ign/validator/validation/database/AttributeUniqueValidatorTest.java b/validator-core/src/test/java/fr/ign/validator/validation/database/AttributeUniqueValidatorTest.java index 1cd89b1b..3dd6c133 100644 --- a/validator-core/src/test/java/fr/ign/validator/validation/database/AttributeUniqueValidatorTest.java +++ b/validator-core/src/test/java/fr/ign/validator/validation/database/AttributeUniqueValidatorTest.java @@ -12,8 +12,8 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.locationtech.jts.geom.Geometry; -import org.opengis.referencing.FactoryException; -import org.opengis.referencing.NoSuchAuthorityCodeException; +import org.geotools.api.referencing.FactoryException; +import org.geotools.api.referencing.NoSuchAuthorityCodeException; import fr.ign.validator.Context; import fr.ign.validator.database.Database; diff --git a/validator-core/src/test/java/fr/ign/validator/validation/database/ForeignKeyValidatorTest.java b/validator-core/src/test/java/fr/ign/validator/validation/database/ForeignKeyValidatorTest.java index e5a59589..c8d8a46a 100644 --- a/validator-core/src/test/java/fr/ign/validator/validation/database/ForeignKeyValidatorTest.java +++ b/validator-core/src/test/java/fr/ign/validator/validation/database/ForeignKeyValidatorTest.java @@ -11,8 +11,8 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.opengis.referencing.FactoryException; -import org.opengis.referencing.NoSuchAuthorityCodeException; +import org.geotools.api.referencing.FactoryException; +import org.geotools.api.referencing.NoSuchAuthorityCodeException; import fr.ign.validator.Context; import fr.ign.validator.database.Database; diff --git a/validator-plugin-cnig/pom.xml b/validator-plugin-cnig/pom.xml index 6f101f4a..02f7a967 100644 --- a/validator-plugin-cnig/pom.xml +++ b/validator-plugin-cnig/pom.xml @@ -3,7 +3,7 @@ fr.ign.validator validator - 4.6.6-SNAPSHOT + 4.7.0-SNAPSHOT validator-plugin-cnig validator-plugin-cnig diff --git a/validator-plugin-dgpr/pom.xml b/validator-plugin-dgpr/pom.xml index 1fed4fef..db5428b0 100644 --- a/validator-plugin-dgpr/pom.xml +++ b/validator-plugin-dgpr/pom.xml @@ -4,7 +4,7 @@ fr.ign.validator validator - 4.6.6-SNAPSHOT + 4.7.0-SNAPSHOT validator-plugin-dgpr diff --git a/validator-plugin-pcrs/pom.xml b/validator-plugin-pcrs/pom.xml index 6cb7885e..a2cb0cd0 100644 --- a/validator-plugin-pcrs/pom.xml +++ b/validator-plugin-pcrs/pom.xml @@ -3,7 +3,7 @@ fr.ign.validator validator - 4.6.6-SNAPSHOT + 4.7.0-SNAPSHOT validator-plugin-pcrs validator-plugin-pcrs