This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a commit to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git
commit 4b753152a6aba3fcb9488398d66fa51b63981b6b Merge: b0713f3f6e 84cb229fe7 Author: Martin Desruisseaux <martin.desruisse...@geomatys.com> AuthorDate: Mon Aug 28 16:16:25 2023 +0200 Merge branch 'geoapi-4.0' into geoapi-3.1 .../sis/buildtools/coding/ReorganizeImports.java | 521 +++++++++++++++++++++ .../apache/sis/buildtools/coding/package-info.java | 10 +- .../main/org/apache/sis/feature/PropertyView.java | 2 +- .../metadata/simple/SimpleIdentifiedObject.java | 4 +- .../org/apache/sis/xml/bind/gco/package-info.java | 2 +- .../org/apache/sis/xml/bind/lan/LanguageCode.java | 4 +- .../main/org/apache/sis/openoffice/CalcAddins.java | 2 +- .../main/org/apache/sis/parameter/Verifier.java | 2 +- .../main/org/apache/sis/referencing/CommonCRS.java | 16 +- .../referencing/factory/CommonAuthorityCode.java | 2 +- .../operation/matrix/AffineTransforms2D.java | 2 +- .../operation/transform/ConcatenatedTransform.java | 2 +- .../apache/sis/storage/netcdf/AttributeNames.java | 8 +- .../apache/sis/storage/netcdf/MetadataReader.java | 30 +- .../org/apache/sis/storage/netcdf/NetcdfStore.java | 16 +- .../org/apache/sis/storage/netcdf/base/Axis.java | 14 +- .../apache/sis/storage/netcdf/base/AxisType.java | 2 +- .../apache/sis/storage/netcdf/base/Convention.java | 6 +- .../apache/sis/storage/netcdf/base/Decoder.java | 6 +- .../apache/sis/storage/netcdf/base/FeatureSet.java | 14 +- .../sis/storage/netcdf/base/GridMapping.java | 4 +- .../apache/sis/storage/netcdf/base/Variable.java | 8 +- .../sis/storage/netcdf/classic/GridInfo.java | 2 +- .../sis/storage/netcdf/classic/VariableInfo.java | 4 +- .../test/module-info.java | 1 + .../apache/sis/util/collection/CacheEntries.java | 4 +- .../apache/sis/util/internal/CollectionsExt.java | 12 +- geoapi/build.gradle.kts | 4 +- netbeans-project/README.md | 3 +- netbeans-project/build.xml | 6 +- netbeans-project/nbproject/build-impl.xml | 38 +- netbeans-project/nbproject/genfiles.properties | 4 +- netbeans-project/nbproject/project.properties | 39 +- netbeans-project/nbproject/project.xml | 1 - netbeans-project/src-local/.gitignore | 5 - .../test/module-info.java | 32 -- .../apache/sis/test/uncommitted/package-info.java | 6 - 37 files changed, 646 insertions(+), 192 deletions(-) diff --cc geoapi/build.gradle.kts index 5b12e748b8,5b12e748b8..3ce4abe6c7 --- a/geoapi/build.gradle.kts +++ b/geoapi/build.gradle.kts @@@ -26,6 -26,6 +26,6 @@@ tasks.register<Exec>("rebuild") inputs.dir("snapshot/geoapi-pending/src/main") inputs.dir("snapshot/geoapi-conformance/src/main") -- outputs.file("snapshot/geoapi-pending/target/geoapi-pending-4.0-SNAPSHOT.jar") -- outputs.file("snapshot/geoapi-conformance/target/geoapi-conformance-4.0-SNAPSHOT.jar") ++ outputs.file("snapshot/geoapi-pending/target/geoapi-pending-3.1-SNAPSHOT.jar") ++ outputs.file("snapshot/geoapi-conformance/target/geoapi-conformance-3.1-SNAPSHOT.jar") } diff --cc netbeans-project/build.xml index 4ce2b57b9e,af190283ca..8407dd5b74 --- a/netbeans-project/build.xml +++ b/netbeans-project/build.xml @@@ -28,9 -28,13 +28,13 @@@ <target name="-pre-compile"> <ivy:settings file="ivy-settings.xml"/> <ivy:retrieve pattern="build/dependencies/[artifact].[ext]" symlink="true" sync="true"/> + <symlink link="${basedir}/build/dependencies/geoapi-pending.jar" - resource="../../../geoapi/snapshot/geoapi-pending/target/geoapi-pending-4.0-SNAPSHOT.jar"/> ++ resource="../../../geoapi/snapshot/geoapi-pending/target/geoapi-pending-3.1-SNAPSHOT.jar"/> + <symlink link="${basedir}/build/dependencies/geoapi-conformance.jar" - resource="../../../geoapi/snapshot/geoapi-conformance/target/geoapi-conformance-4.0-SNAPSHOT.jar"/> ++ resource="../../../geoapi/snapshot/geoapi-conformance/target/geoapi-conformance-3.1-SNAPSHOT.jar"/> </target> <!-- - Called after compilation. Copies the "*.utf" resources files created by GRadle. + Called after compilation. Copies the "*.utf" resources files created by Gradle. Note that the Apache SIS project must have been build by Gradle at least once before it can be built by the NetBeans IDE. --> diff --cc netbeans-project/nbproject/build-impl.xml index 6e5cd08b10,c3ef739c6d..c68a938d25 --- a/netbeans-project/nbproject/build-impl.xml +++ b/netbeans-project/nbproject/build-impl.xml @@@ -795,12 -776,9 +776,9 @@@ public class ModuleInfoSelector extend <fileset dir="${incubator.test.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}"> <filename name="@{testincludes}"/> </fileset> - <fileset dir="${local.test.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}"> - <filename name="@{testincludes}"/> - </fileset> </union> <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/> - <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="Apache_SIS_on_GeoAPI_4.0" testname="TestNG tests" workingDir="${work.dir}"> + <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="Apache_SIS_on_GeoAPI_3.1" testname="TestNG tests" workingDir="${work.dir}"> <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/> <propertyset> <propertyref prefix="test-sys-prop."/> diff --cc netbeans-project/nbproject/genfiles.properties index 78b6aa9139,c6592afb58..b5d9e58bb5 --- a/netbeans-project/nbproject/genfiles.properties +++ b/netbeans-project/nbproject/genfiles.properties @@@ -3,6 -3,6 +3,6 @@@ build.xml.data.CRC32=d82237a1 build.xml.script.CRC32=9a509f0a build.xml.stylesheet.CRC32=32069288@1.22 - nbproject/build-impl.xml.data.CRC32=32292526 - nbproject/build-impl.xml.script.CRC32=41798b68 -nbproject/build-impl.xml.data.CRC32=a5c28f79 -nbproject/build-impl.xml.script.CRC32=9782532a ++nbproject/build-impl.xml.data.CRC32=e365e8d0 ++nbproject/build-impl.xml.script.CRC32=3c96dd2f nbproject/build-impl.xml.stylesheet.CRC32=d1ebcf0f@1.22