You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2023/08/19 09:23:06 UTC

[sis] 01/01: Merge branch 'geoapi-3.1' (NetBeans project configuration).

This is an automated email from the ASF dual-hosted git repository.

desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git

commit 35bab47d62afebc34f059cfd534bdcaa09dea7b2
Merge: d7ebbea200 b099abbec0
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Sat Aug 19 11:22:30 2023 +0200

    Merge branch 'geoapi-3.1' (NetBeans project configuration).

 .gitignore                                         |    3 +-
 netbeans-project/README.md                         |   55 +
 netbeans-project/build.xml                         |   53 +
 netbeans-project/ivy-settings.xml                  |   21 +
 netbeans-project/ivy.xml                           |   42 +
 netbeans-project/nbproject/build-impl.xml          | 1989 ++++++++++++++++++++
 netbeans-project/nbproject/genfiles.properties     |    8 +
 netbeans-project/nbproject/project.properties      |  186 ++
 netbeans-project/nbproject/project.xml             |   32 +
 netbeans-project/src-local/.gitignore              |    5 +
 .../test/module-info.java                          |   32 +
 .../apache/sis/test/uncommitted/package-info.java  |    6 +
 12 files changed, 2431 insertions(+), 1 deletion(-)

diff --cc netbeans-project/ivy.xml
index 0000000000,6aaa72c5d8..b7ed65a546
mode 000000,100644..100644
--- a/netbeans-project/ivy.xml
+++ b/netbeans-project/ivy.xml
@@@ -1,0 -1,40 +1,42 @@@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!--
+   List of all dependencies managed by Ivy for the whole Apache SIS project.
+   All those dependencies are put together on the same module-path given to
+   all SIS modules. The `module-info` files will filter which dependencies
+   are actually needed for each Apache SIS module.
+ 
+   This file may be removed in a future version if NetBeans support of Gradle
+   is improved to the point where Module Source Hierarchy is well supported.
+ -->
+ <ivy-module version="2.0">
+     <info organisation="org.apache" module="sis"/>
+     <dependencies defaultconf="default">
++        <dependency org="org.opengis"            name="geoapi"                  rev="3.0.2"/>
++        <dependency org="org.opengis"            name="geoapi-conformance"      rev="3.0.2"/>
+         <dependency org="javax.measure"          name="unit-api"                rev="2.1.3"/>
+         <dependency org="org.glassfish.jaxb"     name="jaxb-runtime"            rev="4.0.2"/>
+         <dependency org="com.esri.geometry"      name="esri-geometry-api"       rev="2.2.4"/>
+         <dependency org="org.locationtech.jts"   name="jts-core"                rev="1.19.0"/>
+         <dependency org="org.postgresql"         name="postgresql"              rev="42.6.0"/>
+         <dependency org="edu.ucar"               name="cdm-core"                rev="5.5.3"/>
+         <dependency org="edu.ucar"               name="udunits"                 rev="5.5.3"/>
+         <dependency org="org.jdom"               name="jdom2"                   rev="2.0.6"/>
+         <dependency org="joda-time"              name="joda-time"               rev="2.10.3"/>
+         <dependency org="com.google.guava"       name="guava"                   rev="30.1-jre"/>
+         <dependency org="org.libreoffice"        name="libreoffice"             rev="7.3.6"/>
+         <dependency org="software.amazon.awssdk" name="s3"                      rev="2.18.40"/>
+         <dependency org="org.antlr"              name="antlr4-maven-plugin"     rev="4.11.1"/>
+         <dependency org="jakarta.servlet"        name="jakarta.servlet-api"     rev="6.0.0"/>
+         <dependency org="org.osgi"               name="osgi.core"               rev="8.0.0"/>
+         <dependency org="org.junit.platform"     name="junit-platform-launcher" rev="1.9.3"/>
+         <dependency org="org.junit.vintage"      name="junit-vintage-engine"    rev="5.9.3"/>
+         <dependency org="junit"                  name="junit"                   rev="4.13.2"/>
+         <dependency org="org.apache.derby"       name="derby"                   rev="10.15.2.0"/>
+         <dependency org="org.apache.derby"       name="derbytools"              rev="10.15.2.0"/>
+         <dependency org="org.apache.derby"       name="derbyshared"             rev="10.15.2.0"/>
+         <dependency org="org.hsqldb"             name="hsqldb"                  rev="2.7.2"/>
+         <dependency org="com.h2database"         name="h2"                      rev="2.2.220"/>
+         <dependency org="gov.nist.math"          name="jama"                    rev="1.0.3"/>
+         <dependency org="net.sf.geographiclib"   name="GeographicLib-Java"      rev="2.0"/>
+     </dependencies>
+ </ivy-module>
diff --cc netbeans-project/nbproject/build-impl.xml
index 0000000000,6e5cd08b10..18fd96e267
mode 000000,100644..100644
--- a/netbeans-project/nbproject/build-impl.xml
+++ b/netbeans-project/nbproject/build-impl.xml
@@@ -1,0 -1,1989 +1,1989 @@@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ *** GENERATED FROM project.xml - DO NOT EDIT  ***
+ ***         EDIT ../build.xml INSTEAD         ***
+ 
+ For the purpose of easier reading the script
+ is divided into following sections:
+ 
+   - initialization
+   - compilation
+   - jar
+   - execution
+   - debugging
+   - javadoc
+   - test compilation
+   - test execution
+   - test debugging
+   - applet
+   - cleanup
+ 
+         -->
 -<project xmlns:if="ant:if" xmlns:unless="ant:unless" basedir=".." default="default" name="Apache_SIS_on_GeoAPI_3.1-impl">
++<project xmlns:if="ant:if" xmlns:unless="ant:unless" basedir=".." default="default" name="Apache_SIS_on_GeoAPI_3.0-impl">
+     <fail message="Please build using Ant 1.9.7 or higher.">
+         <condition>
+             <not>
+                 <antversion atleast="1.9.7"/>
+             </not>
+         </condition>
+     </fail>
+     <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
+     <!--
+                 ======================
+                 INITIALIZATION SECTION
+                 ======================
+             -->
+     <target name="-pre-init">
+         <!-- Empty placeholder for easier customization. -->
+         <!-- You can override this target in the ../build.xml file. -->
+     </target>
+     <target depends="-pre-init" name="-init-private">
+         <property file="nbproject/private/config.properties"/>
+         <property file="nbproject/private/configs/${config}.properties"/>
+         <property file="nbproject/private/private.properties"/>
+     </target>
+     <target depends="-pre-init,-init-private" name="-init-user">
+         <property file="${user.properties.file}"/>
+         <!-- The two properties below are usually overridden -->
+         <!-- by the active platform. Just a fallback. -->
+         <property name="default.javac.source" value="9"/>
+         <property name="default.javac.target" value="9"/>
+     </target>
+     <target depends="-pre-init,-init-private,-init-user" name="-init-pre-project">
+         <property file="nbproject/configs/${config}.properties"/>
+         <property file="nbproject/project.properties"/>
+         <property name="netbeans.modular.tasks.version" value="1"/>
+         <property location="${build.dir}/tasks/${netbeans.modular.tasks.version}" name="netbeans.modular.tasks.dir"/>
+     </target>
+     <target depends="-init-pre-project" name="-check-netbeans-tasks">
+         <condition property="netbeans.tasks.compiled">
+             <available file="${netbeans.modular.tasks.dir}/out/netbeans/ModuleInfoSelector.class"/>
+         </condition>
+     </target>
+     <target depends="-init-pre-project,-check-netbeans-tasks" name="-init-compile-netbeans-tasks" unless="netbeans.tasks.compiled">
+         <echo file="${netbeans.modular.tasks.dir}/src/netbeans/CoalesceKeyvalue.java">
+ 
+ package netbeans;
+ 
+ import java.util.ArrayList;
+ import java.util.HashMap;
+ import java.util.List;
+ import java.util.Map;
+ import java.util.regex.Pattern;
+ import java.util.stream.Collectors;
+ import org.apache.tools.ant.BuildException;
+ import org.apache.tools.ant.Task;
+ 
+ public class CoalesceKeyvalue extends Task {
+     private String property;
+ 
+     public void setProperty(String property) {
+         this.property = property;
+     }
+ 
+     private String value;
+ 
+     public void setValue(String value) {
+         this.value = value;
+     }
+ 
+     private String valueSep;
+ 
+     public void setValueSep(String valueSep) {
+         this.valueSep = valueSep;
+     }
+ 
+     private String entrySep;
+ 
+     public void setEntrySep(String entrySep) {
+         this.entrySep = entrySep;
+     }
+ 
+     private String multiSep;
+ 
+     public void setMultiSep(String multiSep) {
+         this.multiSep = multiSep;
+     }
+ 
+     private String outSep;
+ 
+     public void setOutSep(String outSep) {
+         this.outSep = outSep;
+     }
+ 
+     @Override
+     public void execute() throws BuildException {
+         List&lt;String&gt; result = new ArrayList&lt;&gt;();
+         Map&lt;String, List&lt;String&gt;&gt; module2Paths = new HashMap&lt;&gt;();
+ 
+         for (String entry : value.split(Pattern.quote(entrySep))) {
+             String[] keyValue = entry.split(Pattern.quote(valueSep), 2);
+             if (keyValue.length == 1) {
+                 result.add(keyValue[0]);
+             } else {
+                 module2Paths.computeIfAbsent(keyValue[0], s -&gt; new ArrayList&lt;&gt;())
+                             .add(keyValue[1].trim());
+             }
+         }
+         module2Paths.entrySet()
+                     .stream()
+                     .forEach(e -&gt; result.add(e.getKey() + valueSep + e.getValue().stream().collect(Collectors.joining(multiSep))));
+         getProject().setProperty(property, result.stream().collect(Collectors.joining(" " + entrySep)));
+     }
+ 
+ }
+ 
+                 </echo>
+         <echo file="${netbeans.modular.tasks.dir}/src/netbeans/ModsourceRegexp.java">
+ 
+ package netbeans;
+ 
+ import java.util.ArrayList;
+ import java.util.List;
+ import java.util.Objects;
+ import java.util.stream.Collectors;
+ import org.apache.tools.ant.BuildException;
+ import org.apache.tools.ant.Task;
+ 
+ public class ModsourceRegexp extends Task {
+     private String property;
+ 
+     public void setProperty(String property) {
+         this.property = property;
+     }
+ 
+     private String filePattern;
+ 
+     public void setFilePattern(String filePattern) {
+         this.filePattern = filePattern;
+     }
+ 
+     private String modsource;
+ 
+     public void setModsource(String modsource) {
+         this.modsource = modsource;
+     }
+ 
+     private List&lt;String&gt; expandGroup(String grp) {
+         List&lt;String&gt; exp = new ArrayList&lt;&gt;();
+         String item = "";
+         int depth = 0;
+ 
+         for (int i = 0; i &lt; grp.length(); i++) {
+             char c = grp.charAt(i);
+             switch (c) {
+                 case '{':
+                     if (depth++ == 0) {
+                         continue;
+                     }
+                     break;
+                 case '}':
+                     if (--depth == 0) {
+                         exp.add(item);
+                         continue;
+                     }
+                     break;
+                 case ',':
+                     if (depth == 1) {
+                         exp.add(item);
+                         item = "";
+                         continue;
+                     }
+                 default:
+                     break;
+             }
+             item = item + c;
+         }
+         return exp;
+     }
+ 
+     private List&lt;String&gt; pathVariants(String spec) {
+         return pathVariants(spec, new ArrayList&lt;&gt;());
+     }
+ 
+     private List&lt;String&gt; pathVariants(String spec, List&lt;String&gt; res) {
+         int start  = spec.indexOf('{');
+         if (start == -1) {
+             res.add(spec);
+             return res;
+         }
+         int depth = 1;
+         int end;
+         for (end = start + 1; end &lt; spec.length() &amp;&amp; depth &gt; 0; end++) {
+             char c = spec.charAt(end);
+             switch (c) {
+                 case '{': depth++; break;
+                 case '}': depth--; break;
+             }
+         }
+         String prefix = spec.substring(0, start);
+         String suffix = spec.substring(end);
+         expandGroup(spec.substring(start, end)).stream().forEach(item -&gt; {
+             pathVariants(prefix + item + suffix, res);
+         });
+         return res;
+     }
+ 
+     private String toRegexp2(String spec, String filepattern, String separator) {
+         List&lt;String&gt; prefixes = new ArrayList&lt;&gt;();
+         List&lt;String&gt; suffixes = new ArrayList&lt;&gt;();
+         pathVariants(spec).forEach(item -&gt; {
+             suffixes.add(item);
+         });
+         String tail = "";
+         String separatorString = separator;
+         if ("\\".equals(separatorString)) {
+             separatorString = "\\\\";
+         }
+         if (filepattern != null &amp;&amp; !Objects.equals(filepattern, tail)) {
+             tail = separatorString + filepattern;
+         }
+         return "([^" + separatorString +"]+)\\Q" + separator + "\\E(" + suffixes.stream().collect(Collectors.joining("|")) + ")" + tail;
+     }
+ 
+     @Override
+     public void execute() throws BuildException {
+         getProject().setProperty(property, toRegexp2(modsource, filePattern, getProject().getProperty("file.separator")));
+     }
+ 
+ }
+ 
+                 </echo>
+         <echo file="${netbeans.modular.tasks.dir}/src/netbeans/ModuleInfoSelector.java">
+ 
+ package netbeans;
+ 
+ import java.io.File;
+ import java.util.Arrays;
+ import org.apache.tools.ant.BuildException;
+ import org.apache.tools.ant.types.selectors.BaseExtendSelector;
+ 
+ public class ModuleInfoSelector extends BaseExtendSelector {
+ 
+     @Override
+     public boolean isSelected(File basedir, String filename, File file) throws BuildException {
+         String extension = Arrays.stream(getParameters())
+                                  .filter(p -&gt; "extension".equals(p.getName()))
+                                  .map(p -&gt; p.getValue())
+                                  .findAny()
+                                  .get();
+         return !new File(file, "module-info." + extension).exists();
+     }
+ 
+ }
+ 
+                 </echo>
+         <mkdir dir="${netbeans.modular.tasks.dir}/out"/>
+         <javac classpath="${ant.core.lib}" destdir="${netbeans.modular.tasks.dir}/out" srcdir="${netbeans.modular.tasks.dir}/src"/>
+     </target>
+     <target depends="-init-pre-project,-init-compile-netbeans-tasks" name="-init-project">
+         <taskdef classname="netbeans.CoalesceKeyvalue" classpath="${netbeans.modular.tasks.dir}/out" name="coalesce_keyvalue" uri="http://www.netbeans.org/ns/j2se-modular-project/1"/>
+         <taskdef classname="netbeans.ModsourceRegexp" classpath="${netbeans.modular.tasks.dir}/out" name="modsource_regexp" uri="http://www.netbeans.org/ns/j2se-modular-project/1"/>
+     </target>
+     <target name="-init-source-module-properties">
+         <property name="javac.modulepath" value=""/>
+         <property name="run.modulepath" value="${javac.modulepath}:${build.modules.dir}"/>
+         <property name="debug.modulepath" value="${run.modulepath}"/>
+         <property name="javac.upgrademodulepath" value=""/>
+         <property name="run.upgrademodulepath" value="${javac.upgrademodulepath}"/>
+         <condition else="" property="javac.systemmodulepath.cmd.line.arg" value="-system '${javac.systemmodulepath}'">
+             <and>
+                 <isset property="javac.systemmodulepath"/>
+                 <length length="0" string="${javac.systemmodulepath}" when="greater"/>
+             </and>
+         </condition>
+         <property name="dist.jlink.dir" value="${dist.dir}/jlink"/>
+         <property name="dist.jlink.output" value="${dist.jlink.dir}/${application.title}"/>
+     </target>
+     <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
+         <property name="platform.java" value="${java.home}/bin/java"/>
+         <j2semodularproject1:modsource_regexp xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" modsource="${test.src.dir.path}" property="have.tests.test.src.dir.regexp"/>
+         <dirset dir="${basedir}/${test.src.dir}" id="have.tests.test.src.dir.set" includes="*/*">
+             <filename regex="${have.tests.test.src.dir.regexp}"/>
+         </dirset>
+         <j2semodularproject1:modsource_regexp xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" modsource="${optional.test.dir.path}" property="have.tests.optional.test.dir.regexp"/>
+         <dirset dir="${basedir}/${optional.test.dir}" id="have.tests.optional.test.dir.set" includes="*/*">
+             <filename regex="${have.tests.optional.test.dir.regexp}"/>
+         </dirset>
+         <j2semodularproject1:modsource_regexp xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" modsource="${incubator.test.dir.path}" property="have.tests.incubator.test.dir.regexp"/>
+         <dirset dir="${basedir}/${incubator.test.dir}" id="have.tests.incubator.test.dir.set" includes="*/*">
+             <filename regex="${have.tests.incubator.test.dir.regexp}"/>
+         </dirset>
+         <j2semodularproject1:modsource_regexp xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" modsource="${local.test.dir.path}" property="have.tests.local.test.dir.regexp"/>
+         <dirset dir="${basedir}/${local.test.dir}" id="have.tests.local.test.dir.set" includes="*/*">
+             <filename regex="${have.tests.local.test.dir.regexp}"/>
+         </dirset>
+         <union id="have.tests.set">
+             <dirset refid="have.tests.test.src.dir.set"/>
+             <dirset refid="have.tests.optional.test.dir.set"/>
+             <dirset refid="have.tests.incubator.test.dir.set"/>
+             <dirset refid="have.tests.local.test.dir.set"/>
+         </union>
+         <condition property="have.tests">
+             <or>
+                 <resourcecount count="0" when="greater">
+                     <union refid="have.tests.set"/>
+                 </resourcecount>
+                 <resourcecount count="0" when="greater">
+                     <union refid="have.tests.set"/>
+                 </resourcecount>
+                 <resourcecount count="0" when="greater">
+                     <union refid="have.tests.set"/>
+                 </resourcecount>
+                 <resourcecount count="0" when="greater">
+                     <union refid="have.tests.set"/>
+                 </resourcecount>
+             </or>
+         </condition>
+         <j2semodularproject1:modsource_regexp xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" modsource="${test.src.dir.path}" property="have.tests.test.src.dir.regexp"/>
+         <dirset dir="${basedir}/${test.src.dir}" id="have.tests.test.src.dir.patchset" includes="*/*">
+             <filename regex="${have.tests.test.src.dir.regexp}"/>
+         </dirset>
+         <j2semodularproject1:modsource_regexp xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" modsource="${optional.test.dir.path}" property="have.tests.optional.test.dir.regexp"/>
+         <dirset dir="${basedir}/${optional.test.dir}" id="have.tests.optional.test.dir.patchset" includes="*/*">
+             <filename regex="${have.tests.optional.test.dir.regexp}"/>
+         </dirset>
+         <j2semodularproject1:modsource_regexp xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" modsource="${incubator.test.dir.path}" property="have.tests.incubator.test.dir.regexp"/>
+         <dirset dir="${basedir}/${incubator.test.dir}" id="have.tests.incubator.test.dir.patchset" includes="*/*">
+             <filename regex="${have.tests.incubator.test.dir.regexp}"/>
+         </dirset>
+         <j2semodularproject1:modsource_regexp xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" modsource="${local.test.dir.path}" property="have.tests.local.test.dir.regexp"/>
+         <dirset dir="${basedir}/${local.test.dir}" id="have.tests.local.test.dir.patchset" includes="*/*">
+             <filename regex="${have.tests.local.test.dir.regexp}"/>
+         </dirset>
+         <union id="have.tests.patchset">
+             <dirset refid="have.tests.test.src.dir.patchset"/>
+             <dirset refid="have.tests.optional.test.dir.patchset"/>
+             <dirset refid="have.tests.incubator.test.dir.patchset"/>
+             <dirset refid="have.tests.local.test.dir.patchset"/>
+         </union>
+         <j2semodularproject1:modsource_regexp xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" modsource="${src.dir.path}" property="have.sources.src.dir.regexp"/>
+         <dirset dir="${basedir}/${src.dir}" id="have.sources.src.dir.set" includes="*/*">
+             <filename regex="${have.sources.src.dir.regexp}"/>
+         </dirset>
+         <j2semodularproject1:modsource_regexp xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" modsource="${optional.main.dir.path}" property="have.sources.optional.main.dir.regexp"/>
+         <dirset dir="${basedir}/${optional.main.dir}" id="have.sources.optional.main.dir.set" includes="*/*">
+             <filename regex="${have.sources.optional.main.dir.regexp}"/>
+         </dirset>
+         <j2semodularproject1:modsource_regexp xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" modsource="${incubator.main.dir.path}" property="have.sources.incubator.main.dir.regexp"/>
+         <dirset dir="${basedir}/${incubator.main.dir}" id="have.sources.incubator.main.dir.set" includes="*/*">
+             <filename regex="${have.sources.incubator.main.dir.regexp}"/>
+         </dirset>
+         <union id="have.sources.set">
+             <dirset refid="have.sources.src.dir.set"/>
+             <dirset refid="have.sources.optional.main.dir.set"/>
+             <dirset refid="have.sources.incubator.main.dir.set"/>
+         </union>
+         <condition property="have.sources">
+             <or>
+                 <resourcecount count="0" when="greater">
+                     <union refid="have.sources.set"/>
+                 </resourcecount>
+                 <resourcecount count="0" when="greater">
+                     <union refid="have.sources.set"/>
+                 </resourcecount>
+                 <resourcecount count="0" when="greater">
+                     <union refid="have.sources.set"/>
+                 </resourcecount>
+             </or>
+         </condition>
+         <condition property="main.class.available">
+             <and>
+                 <isset property="main.class"/>
+                 <not>
+                     <equals arg1="${main.class}" arg2="" trim="true"/>
+                 </not>
+             </and>
+         </condition>
+         <condition property="netbeans.home+have.tests">
+             <and>
+                 <isset property="netbeans.home"/>
+                 <isset property="have.tests"/>
+             </and>
+         </condition>
+         <condition property="no.javadoc.preview">
+             <and>
+                 <isset property="javadoc.preview"/>
+                 <isfalse value="${javadoc.preview}"/>
+             </and>
+         </condition>
+         <condition property="do.archive">
+             <or>
+                 <not>
+                     <istrue value="${jar.archive.disabled}"/>
+                 </not>
+                 <istrue value="${not.archive.disabled}"/>
+             </or>
+         </condition>
+         <property name="run.jvmargs" value=""/>
+         <property name="run.jvmargs.ide" value=""/>
+         <property name="javac.compilerargs" value=""/>
+         <property name="work.dir" value="${basedir}"/>
+         <condition property="no.deps">
+             <and>
+                 <istrue value="${no.dependencies}"/>
+             </and>
+         </condition>
+         <property name="javac.debug" value="true"/>
+         <property name="javadoc.preview" value="true"/>
+         <property name="application.args" value=""/>
+         <property name="source.encoding" value="${file.encoding}"/>
+         <property name="runtime.encoding" value="${source.encoding}"/>
+         <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
+             <and>
+                 <isset property="javadoc.encoding"/>
+                 <not>
+                     <equals arg1="${javadoc.encoding}" arg2=""/>
+                 </not>
+             </and>
+         </condition>
+         <property name="javadoc.encoding.used" value="${source.encoding}"/>
+         <property name="includes" value="**"/>
+         <property name="excludes" value=""/>
+         <property name="do.depend" value="false"/>
+         <condition property="do.depend.true">
+             <istrue value="${do.depend}"/>
+         </condition>
+         <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
+         <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
+             <and>
+                 <isset property="endorsed.classpath"/>
+                 <not>
+                     <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
+                 </not>
+             </and>
+         </condition>
+         <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
+             <isset property="profile.available"/>
+         </condition>
+         <condition else="false" property="jdkBug6558476">
+             <and>
+                 <matches pattern="1\.[56]" string="${java.specification.version}"/>
+                 <not>
+                     <os family="unix"/>
+                 </not>
+             </and>
+         </condition>
+         <condition else="false" property="javac.fork">
+             <or>
+                 <istrue value="${jdkBug6558476}"/>
+                 <istrue value="${javac.external.vm}"/>
+             </or>
+         </condition>
+         <condition property="main.class.check.available">
+             <and>
+                 <isset property="libs.CopyLibs.classpath"/>
+                 <available classname="org.netbeans.modules.java.j2seproject.moduletask.ModuleMainClass" classpath="${libs.CopyLibs.classpath}"/>
+             </and>
+         </condition>
+         <property name="jar.index" value="false"/>
+         <property name="jar.index.metainf" value="${jar.index}"/>
+         <condition property="junit.available">
+             <or>
+                 <available classname="org.junit.Test" classpath="${run.test.classpath}"/>
+                 <available classname="junit.framework.Test" classpath="${run.test.classpath}"/>
+             </or>
+         </condition>
+         <condition property="testng.available">
+             <available classname="org.testng.annotations.Test" classpath="${run.test.classpath}"/>
+         </condition>
+         <condition property="junit+testng.available">
+             <and>
+                 <istrue value="${junit.available}"/>
+                 <istrue value="${testng.available}"/>
+             </and>
+         </condition>
+         <condition else="testng" property="testng.mode" value="mixed">
+             <istrue value="${junit+testng.available}"/>
+         </condition>
+         <condition else="" property="testng.debug.mode" value="-mixed">
+             <istrue value="${junit+testng.available}"/>
+         </condition>
+         <property name="java.failonerror" value="true"/>
+         <macrodef name="for-paths" uri="http://www.netbeans.org/ns/j2se-modular-project/1">
+             <attribute name="paths"/>
+             <attribute default="${path.separator}" name="separator"/>
+             <element implicit="yes" name="call"/>
+             <sequential>
+                 <local name="entry"/>
+                 <local name="tail"/>
+                 <local name="moreElements"/>
+                 <loadresource property="entry" quiet="true" unless:blank="@{paths}">
+                     <concat>@{paths}</concat>
+                     <filterchain>
+                         <replaceregex pattern="([^@{separator}]*)\Q@{separator}\E.*" replace="\1"/>
+                     </filterchain>
+                 </loadresource>
+                 <sequential if:set="entry">
+                     <call/>
+                 </sequential>
+                 <condition else="false" property="moreElements" value="true">
+                     <contains string="@{paths}" substring="@{separator}"/>
+                 </condition>
+                 <loadresource if:true="${moreElements}" property="tail" quiet="true">
+                     <concat>@{paths}</concat>
+                     <filterchain>
+                         <replaceregex pattern="[^@{separator}]*\Q@{separator}\E(.*)" replace="\1"/>
+                     </filterchain>
+                 </loadresource>
+                 <j2semodularproject1:for-paths xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" if:true="${moreElements}" paths="${tail}">
+                     <call/>
+                 </j2semodularproject1:for-paths>
+             </sequential>
+         </macrodef>
+         <property name="modules.supported.internal" value="true"/>
+         <condition else="${file.separator}" property="file.separator.string" value="\${file.separator}">
+             <equals arg1="${file.separator}" arg2="\"/>
+         </condition>
+     </target>
+     <target name="-post-init">
+         <!-- Empty placeholder for easier customization. -->
+         <!-- You can override this target in the ../build.xml file. -->
+     </target>
+     <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
+         <fail unless="src.dir">Must set src.dir</fail>
+         <fail unless="optional.main.dir">Must set optional.main.dir</fail>
+         <fail unless="incubator.main.dir">Must set incubator.main.dir</fail>
+         <fail unless="test.src.dir">Must set test.src.dir</fail>
+         <fail unless="optional.test.dir">Must set optional.test.dir</fail>
+         <fail unless="incubator.test.dir">Must set incubator.test.dir</fail>
+         <fail unless="local.test.dir">Must set local.test.dir</fail>
+         <fail unless="build.dir">Must set build.dir</fail>
+         <fail unless="dist.dir">Must set dist.dir</fail>
+         <fail unless="build.modules.dir">Must set build.modules.dir</fail>
+         <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
+         <fail unless="build.test.modules.dir">Must set build.test.modules.dir</fail>
+         <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
+         <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
+         <fail message="Java 9 support requires Ant 1.10.0 or higher.">
+             <condition>
+                 <not>
+                     <antversion atleast="1.10.0"/>
+                 </not>
+             </condition>
+         </fail>
+     </target>
+     <target name="-init-macrodef-property">
+         <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-modular-project/1">
+             <attribute name="name"/>
+             <attribute name="value"/>
+             <sequential>
+                 <property name="@{name}" value="${@{value}}"/>
+             </sequential>
+         </macrodef>
+     </target>
+     <target depends="-init-ap-cmdline-properties,-init-source-module-properties" name="-init-macrodef-javac">
+         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-modular-project/1">
+             <attribute default="${build.modules.dir}" name="destdir"/>
+             <attribute default="${javac.classpath}" name="classpath"/>
+             <attribute default="${javac.modulepath}" name="modulepath"/>
+             <attribute default="${src.dir}/*/${src.dir.path}:${optional.main.dir}/*/${optional.main.dir.path}:${incubator.main.dir}/*/${incubator.main.dir.path}" name="modulesourcepath"/>
+             <attribute default="${javac.upgrademodulepath}" name="upgrademodulepath"/>
+             <attribute default="${javac.processorpath}" name="processorpath"/>
+             <attribute default="${javac.processormodulepath}" name="processormodulepath"/>
+             <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
+             <attribute default="${includes}" name="includes"/>
+             <attribute default="${excludes}" name="excludes"/>
+             <attribute default="${javac.debug}" name="debug"/>
+             <attribute default="${empty.dir}" name="gensrcdir"/>
+             <element name="customize" optional="true"/>
+             <sequential>
+                 <property location="${build.dir}/empty" name="empty.dir"/>
+                 <mkdir dir="${empty.dir}"/>
+                 <mkdir dir="@{apgeneratedsrcdir}"/>
+                 <condition property="processormodulepath.set">
+                     <resourcecount count="0" when="greater">
+                         <path>
+                             <pathelement path="@{processormodulepath}"/>
+                         </path>
+                     </resourcecount>
+                 </condition>
+                 <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" release="${javac.source}" tempdir="${java.io.tmpdir}">
+                     <classpath>
+                         <path path="@{classpath}"/>
+                     </classpath>
+                     <modulepath>
+                         <path path="@{modulepath}"/>
+                     </modulepath>
+                     <modulesourcepath>
+                         <path path="@{modulesourcepath}"/>
+                     </modulesourcepath>
+                     <upgrademodulepath>
+                         <path path="@{upgrademodulepath}"/>
+                     </upgrademodulepath>
+                     <compilerarg line="${javac.systemmodulepath.cmd.line.arg}"/>
+                     <compilerarg line="${javac.profile.cmd.line.arg}"/>
+                     <compilerarg line="${javac.compilerargs}"/>
+                     <compilerarg if:set="processormodulepath.set" value="--processor-module-path"/>
+                     <compilerarg if:set="processormodulepath.set" path="@{processormodulepath}"/>
+                     <compilerarg unless:set="processormodulepath.set" value="-processorpath"/>
+                     <compilerarg path="@{processorpath}:${empty.dir}" unless:set="processormodulepath.set"/>
+                     <compilerarg line="${ap.processors.internal}"/>
+                     <compilerarg line="${annotation.processing.processor.options}"/>
+                     <compilerarg value="-s"/>
+                     <compilerarg path="@{apgeneratedsrcdir}"/>
+                     <compilerarg line="${ap.proc.none.internal}"/>
+                     <customize/>
+                 </javac>
+             </sequential>
+         </macrodef>
+     </target>
+     <target depends="-init-macrodef-javac" name="-init-macrodef-javac-depend">
+         <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-modular-project/1">
+             <attribute default="${src.dir}:${optional.main.dir}:${incubator.main.dir}" name="srcdir"/>
+             <attribute default="${build.classes.dir}" name="destdir"/>
+             <attribute default="${javac.classpath}" name="classpath"/>
+             <sequential>
+                 <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
+                     <classpath>
+                         <path path="@{classpath}"/>
+                     </classpath>
+                 </depend>
+             </sequential>
+         </macrodef>
+         <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-modular-project/1">
+             <attribute default="${build.modules.dir}" name="destdir"/>
+             <sequential>
+                 <fail unless="javac.includes">Must set javac.includes</fail>
+                 <pathconvert pathsep="${line.separator}" property="javac.includes.binary">
+                     <path>
+                         <filelist dir="@{destdir}" files="${javac.includes}"/>
+                     </path>
+                     <globmapper from="*.java" to="*.class"/>
+                 </pathconvert>
+                 <tempfile deleteonexit="true" property="javac.includesfile.binary"/>
+                 <echo file="${javac.includesfile.binary}" message="${javac.includes.binary}"/>
+                 <delete>
+                     <files includesfile="${javac.includesfile.binary}"/>
+                 </delete>
+                 <delete>
+                     <fileset file="${javac.includesfile.binary}"/>
+                 </delete>
+             </sequential>
+         </macrodef>
+     </target>
+     <target if="${junit.available}" name="-init-macrodef-junit-init">
+         <condition else="false" property="nb.junit.batch" value="true">
+             <and>
+                 <istrue value="${junit.available}"/>
+                 <not>
+                     <isset property="test.method"/>
+                 </not>
+             </and>
+         </condition>
+         <condition else="false" property="nb.junit.single" value="true">
+             <and>
+                 <istrue value="${junit.available}"/>
+                 <isset property="test.method"/>
+             </and>
+         </condition>
+     </target>
+     <target name="-init-test-properties">
+         <property name="test.binaryincludes" value="&lt;nothing&gt;"/>
+         <property name="test.binarytestincludes" value=""/>
+         <property name="test.binaryexcludes" value=""/>
+     </target>
+     <target name="-init-macrodef-junit-prototype">
+         <macrodef name="junit-prototype" uri="http://www.netbeans.org/ns/j2se-modular-project/1">
+             <attribute default="${includes}" name="includes"/>
+             <attribute default="${excludes}" name="excludes"/>
+             <element name="customizePrototype" optional="true"/>
+             <sequential>
+                 <property location="${build.dir}/empty" name="empty.dir"/>
+                 <property name="junit.forkmode" value="perTest"/>
+                 <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
+                     <syspropertyset>
+                         <propertyref prefix="test-sys-prop."/>
+                         <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                     </syspropertyset>
+                     <classpath>
+                         <path path="${run.test.classpath}"/>
+                     </classpath>
+                     <formatter type="brief" usefile="false"/>
+                     <formatter type="xml"/>
+                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                     <jvmarg value="-ea"/>
+                     <jvmarg value="--module-path"/>
+                     <jvmarg path="${run.modulepath}${path.separator}${run.test.modulepath}${path.separator}${empty.dir}"/>
+                     <jvmarg line="${run.test.jvmargs}"/>
+                     <customizePrototype/>
+                 </junit>
+             </sequential>
+         </macrodef>
+     </target>
+     <target depends="-init-test-properties,-init-macrodef-junit-prototype" if="${nb.junit.single}" name="-init-macrodef-junit-single" unless="${nb.junit.batch}">
+         <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-modular-project/1">
+             <attribute default="${includes}" name="includes"/>
+             <attribute default="${excludes}" name="excludes"/>
+             <attribute default="**" name="testincludes"/>
+             <attribute default="" name="testmethods"/>
+             <element name="customize" optional="true"/>
+             <sequential>
+                 <j2semodularproject1:junit-prototype xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1">
+                     <customizePrototype>
+                         <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/>
+                         <customize/>
+                     </customizePrototype>
+                 </j2semodularproject1:junit-prototype>
+             </sequential>
+         </macrodef>
+     </target>
+     <target depends="-init-test-properties,-init-macrodef-junit-prototype" if="${nb.junit.batch}" name="-init-macrodef-junit-batch" unless="${nb.junit.single}">
+         <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-modular-project/1">
+             <attribute default="${includes}" name="includes"/>
+             <attribute default="${excludes}" name="excludes"/>
+             <attribute default="**" name="testincludes"/>
+             <attribute default="" name="testmethods"/>
+             <element name="customize" optional="true"/>
+             <sequential>
+                 <j2semodularproject1:junit-prototype xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1">
+                     <customizePrototype>
+                         <batchtest todir="${build.test.results.dir}">
+                             <mappedresources>
+                                 <union>
+                                     <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="**/@{includes}">
+                                         <filename name="**/@{testincludes}"/>
+                                         <filename regex="${have.tests.test.src.dir.regexp}"/>
+                                     </fileset>
+                                     <fileset dir="${optional.test.dir}" excludes="@{excludes},${excludes}" includes="**/@{includes}">
+                                         <filename name="**/@{testincludes}"/>
+                                         <filename regex="${have.tests.optional.test.dir.regexp}"/>
+                                     </fileset>
+                                     <fileset dir="${incubator.test.dir}" excludes="@{excludes},${excludes}" includes="**/@{includes}">
+                                         <filename name="**/@{testincludes}"/>
+                                         <filename regex="${have.tests.incubator.test.dir.regexp}"/>
+                                     </fileset>
+                                     <fileset dir="${local.test.dir}" excludes="@{excludes},${excludes}" includes="**/@{includes}">
+                                         <filename name="**/@{testincludes}"/>
+                                         <filename regex="${have.tests.local.test.dir.regexp}"/>
+                                     </fileset>
+                                 </union>
+                                 <regexpmapper from="${have.tests.test.src.dir.regexp}\Q${file.separator}\E(.*)$" to="\3"/>
+                                 <regexpmapper from="${have.tests.optional.test.dir.regexp}\Q${file.separator}\E(.*)$" to="\3"/>
+                                 <regexpmapper from="${have.tests.incubator.test.dir.regexp}\Q${file.separator}\E(.*)$" to="\3"/>
+                                 <regexpmapper from="${have.tests.local.test.dir.regexp}\Q${file.separator}\E(.*)$" to="\3"/>
+                             </mappedresources>
+                             <fileset dir="${build.test.modules.dir}" excludes="@{excludes},${excludes},${test.binaryexcludes}" includes="${test.binaryincludes}">
+                                 <filename name="${test.binarytestincludes}"/>
+                             </fileset>
+                         </batchtest>
+                         <customize/>
+                     </customizePrototype>
+                 </j2semodularproject1:junit-prototype>
+             </sequential>
+         </macrodef>
+     </target>
+     <target depends="-init-macrodef-junit-init,-init-macrodef-junit-single, -init-macrodef-junit-batch" if="${junit.available}" name="-init-macrodef-junit"/>
+     <target if="${testng.available}" name="-init-macrodef-testng">
+         <macrodef name="testng" uri="http://www.netbeans.org/ns/j2se-modular-project/1">
+             <attribute default="${includes}" name="includes"/>
+             <attribute default="${excludes}" name="excludes"/>
+             <attribute default="**" name="testincludes"/>
+             <attribute default="" name="testmethods"/>
+             <element name="customize" optional="true"/>
+             <sequential>
+                 <condition else="" property="testng.methods.arg" value="@{testincludes}.@{testmethods}">
+                     <isset property="test.method"/>
+                 </condition>
+                 <union id="test.set">
+                     <fileset dir="${test.src.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
+                         <filename name="@{testincludes}"/>
+                     </fileset>
+                     <fileset dir="${optional.test.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
+                         <filename name="@{testincludes}"/>
+                     </fileset>
+                     <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_3.1" 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.0" testname="TestNG tests" workingDir="${work.dir}">
+                     <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
+                     <propertyset>
+                         <propertyref prefix="test-sys-prop."/>
+                         <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                     </propertyset>
+                     <classpath>
+                         <path path="${run.test.classpath}"/>
+                     </classpath>
+                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                     <customize/>
+                 </testng>
+             </sequential>
+         </macrodef>
+     </target>
+     <target name="-init-macrodef-test-impl">
+         <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-modular-project/1">
+             <attribute default="${includes}" name="includes"/>
+             <attribute default="${excludes}" name="excludes"/>
+             <attribute default="**" name="testincludes"/>
+             <attribute default="" name="testmethods"/>
+             <element implicit="true" name="customize" optional="true"/>
+             <sequential>
+                 <echo>No tests executed.</echo>
+             </sequential>
+         </macrodef>
+     </target>
+     <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-impl">
+         <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-modular-project/1">
+             <attribute default="${includes}" name="includes"/>
+             <attribute default="${excludes}" name="excludes"/>
+             <attribute default="**" name="testincludes"/>
+             <attribute default="" name="testmethods"/>
+             <element implicit="true" name="customize" optional="true"/>
+             <sequential>
+                 <j2semodularproject1:junit xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                     <customize/>
+                 </j2semodularproject1:junit>
+             </sequential>
+         </macrodef>
+     </target>
+     <target depends="-init-macrodef-testng" if="${testng.available}" name="-init-macrodef-testng-impl">
+         <macrodef name="test-impl" uri="http://www.netbeans.org/ns/j2se-modular-project/1">
+             <attribute default="${includes}" name="includes"/>
+             <attribute default="${excludes}" name="excludes"/>
+             <attribute default="**" name="testincludes"/>
+             <attribute default="" name="testmethods"/>
+             <element implicit="true" name="customize" optional="true"/>
+             <sequential>
+                 <j2semodularproject1:testng xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                     <customize/>
+                 </j2semodularproject1:testng>
+             </sequential>
+         </macrodef>
+     </target>
+     <target depends="-init-macrodef-test-impl,-init-macrodef-junit-impl,-init-macrodef-testng-impl" name="-init-macrodef-test">
+         <macrodef name="test" uri="http://www.netbeans.org/ns/j2se-modular-project/1">
+             <attribute default="${includes}" name="includes"/>
+             <attribute default="${excludes}" name="excludes"/>
+             <attribute default="**" name="testincludes"/>
+             <attribute default="" name="testmethods"/>
+             <sequential>
+                 <j2semodularproject1:test-impl xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                     <customize>
+                         <jvmarg line="${run.jvmargs}"/>
+                         <jvmarg line="${run.jvmargs.ide}"/>
+                     </customize>
+                 </j2semodularproject1:test-impl>
+             </sequential>
+         </macrodef>
+     </target>
+     <target depends="-init-macrodef-junit" if="${junit.available}" name="-init-macrodef-junit-debug-impl">
+         <macrodef name="test-debug-impl" uri="http://www.netbeans.org/ns/j2se-modular-project/1">
+             <attribute default="${includes}" name="includes"/>
+             <attribute default="${excludes}" name="excludes"/>
+             <attribute default="**" name="testincludes"/>
+             <attribute default="" name="testmethods"/>
+             <element name="customizeDebuggee" optional="true"/>
+             <sequential>
+                 <j2semodularproject1:junit xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                     <customize>
+                         <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
+                         <customizeDebuggee/>
+                     </customize>
+                 </j2semodularproject1:junit>
+             </sequential>
+         </macrodef>
+     </target>
+     <target if="${testng.available}" name="-init-macrodef-testng-debug">
+         <macrodef name="testng-debug" uri="http://www.netbeans.org/ns/j2se-modular-project/1">
+             <attribute default="${main.class}" name="testClass"/>
+             <attribute default="" name="testMethod"/>
+             <element name="customize2" optional="true"/>
+             <sequential>
+                 <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
+                     <isset property="test.method"/>
+                 </condition>
 -                <condition else="-suitename Apache_SIS_on_GeoAPI_3.1 -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
++                <condition else="-suitename Apache_SIS_on_GeoAPI_3.0 -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
+                     <matches pattern=".*\.xml" string="@{testClass}"/>
+                 </condition>
+                 <delete dir="${build.test.results.dir}" quiet="true"/>
+                 <mkdir dir="${build.test.results.dir}"/>
+                 <j2semodularproject1:debug xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" classname="org.testng.TestNG" classpath="${debug.test.classpath}">
+                     <customizeDebuggee>
+                         <customize2/>
+                         <jvmarg value="-ea"/>
+                         <arg line="${testng.debug.mode}"/>
+                         <arg line="-d ${build.test.results.dir}"/>
+                         <arg line="-listener org.testng.reporters.VerboseReporter"/>
+                         <arg line="${testng.cmd.args}"/>
+                     </customizeDebuggee>
+                 </j2semodularproject1:debug>
+             </sequential>
+         </macrodef>
+     </target>
+     <target depends="-init-macrodef-testng-debug" if="${testng.available}" name="-init-macrodef-testng-debug-impl">
+         <macrodef name="testng-debug-impl" uri="http://www.netbeans.org/ns/j2se-modular-project/1">
+             <attribute default="${main.class}" name="testClass"/>
+             <attribute default="" name="testMethod"/>
+             <element implicit="true" name="customize2" optional="true"/>
+             <sequential>
+                 <j2semodularproject1:testng-debug xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" testClass="@{testClass}" testMethod="@{testMethod}">
+                     <customize2/>
+                 </j2semodularproject1:testng-debug>
+             </sequential>
+         </macrodef>
+     </target>
+     <target depends="-init-macrodef-junit-debug-impl" if="${junit.available}" name="-init-macrodef-test-debug-junit">
+         <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-modular-project/1">
+             <attribute default="${includes}" name="includes"/>
+             <attribute default="${excludes}" name="excludes"/>
+             <attribute default="**" name="testincludes"/>
+             <attribute default="" name="testmethods"/>
+             <attribute default="${main.class}" name="testClass"/>
+             <attribute default="" name="testMethod"/>
+             <sequential>
+                 <j2semodularproject1:test-debug-impl xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" excludes="@{excludes}" includes="@{includes}" testincludes="@{testincludes}" testmethods="@{testmethods}">
+                     <customizeDebuggee>
+                         <jvmarg line="${run.jvmargs}"/>
+                         <jvmarg line="${run.jvmargs.ide}"/>
+                     </customizeDebuggee>
+                 </j2semodularproject1:test-debug-impl>
+             </sequential>
+         </macrodef>
+     </target>
+     <target depends="-init-macrodef-testng-debug-impl" if="${testng.available}" name="-init-macrodef-test-debug-testng">
+         <macrodef name="test-debug" uri="http://www.netbeans.org/ns/j2se-modular-project/1">
+             <attribute default="${includes}" name="includes"/>
+             <attribute default="${excludes}" name="excludes"/>
+             <attribute default="**" name="testincludes"/>
+             <attribute default="" name="testmethods"/>
+             <attribute default="${main.class}" name="testClass"/>
+             <attribute default="" name="testMethod"/>
+             <sequential>
+                 <j2semodularproject1:testng-debug-impl xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" testClass="@{testClass}" testMethod="@{testMethod}">
+                     <customize2>
+                         <syspropertyset>
+                             <propertyref prefix="test-sys-prop."/>
+                             <mapper from="test-sys-prop.*" to="*" type="glob"/>
+                         </syspropertyset>
+                     </customize2>
+                 </j2semodularproject1:testng-debug-impl>
+             </sequential>
+         </macrodef>
+     </target>
+     <target depends="-init-macrodef-test-debug-junit,-init-macrodef-test-debug-testng" name="-init-macrodef-test-debug"/>
+     <!--
+                 pre NB7.2 profiling section; consider it deprecated
+             -->
+     <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile, -profile-init-check" if="profiler.info.jvmargs.agent" name="profile-init"/>
+     <target if="profiler.info.jvmargs.agent" name="-profile-pre-init">
+         <!-- Empty placeholder for easier customization. -->
+         <!-- You can override this target in the ../build.xml file. -->
+     </target>
+     <target if="profiler.info.jvmargs.agent" name="-profile-post-init">
+         <!-- Empty placeholder for easier customization. -->
+         <!-- You can override this target in the ../build.xml file. -->
+     </target>
+     <target if="profiler.info.jvmargs.agent" name="-profile-init-macrodef-profile">
+         <macrodef name="resolve">
+             <attribute name="name"/>
+             <attribute name="value"/>
+             <sequential>
+                 <property name="@{name}" value="${env.@{value}}"/>
+             </sequential>
+         </macrodef>
+         <macrodef name="profile">
+             <attribute default="${main.class}" name="classname"/>
+             <element name="customize" optional="true"/>
+             <sequential>
+                 <property environment="env"/>
+                 <resolve name="profiler.current.path" value="${profiler.info.pathvar}"/>
+                 <java classname="@{classname}" dir="${profiler.info.dir}" failonerror="${java.failonerror}" fork="true" jvm="${profiler.info.jvm}">
+                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
+                     <jvmarg value="${profiler.info.jvmargs.agent}"/>
+                     <jvmarg line="${profiler.info.jvmargs}"/>
+                     <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
+                     <arg line="${application.args}"/>
+                     <classpath>
+                         <path path="${run.classpath}"/>
+                     </classpath>
+                     <syspropertyset>
+                         <propertyref prefix="run-sys-prop."/>
+                         <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                     </syspropertyset>
+                     <customize/>
+                 </java>
+             </sequential>
+         </macrodef>
+     </target>
+     <target depends="-profile-pre-init, init, -profile-post-init, -profile-init-macrodef-profile" if="profiler.info.jvmargs.agent" name="-profile-init-check">
+         <fail unless="profiler.info.jvm">Must set JVM to use for profiling in profiler.info.jvm</fail>
+         <fail unless="profiler.info.jvmargs.agent">Must set profiler agent JVM arguments in profiler.info.jvmargs.agent</fail>
+     </target>
+     <!--
+                 end of pre NB7.2 profiling section
+             -->
+     <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
+         <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-modular-project/1">
+             <attribute default="${main.class}" name="name"/>
+             <attribute default="${debug.modulepath}" name="modulepath"/>
+             <attribute default="${debug.classpath}" name="classpath"/>
+             <attribute default="" name="stopclassname"/>
+             <sequential>
+                 <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="${debug-transport}">
+                     <modulepath>
+                         <path path="@{modulepath}"/>
+                     </modulepath>
+                     <classpath>
+                         <path path="@{classpath}"/>
+                     </classpath>
+                 </nbjpdastart>
+             </sequential>
+         </macrodef>
+         <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-modular-project/1">
+             <attribute default="${debug.modules.dir}" name="dir"/>
+             <sequential>
+                 <nbjpdareload>
+                     <fileset dir="@{dir}" includes="${fix.classes}">
+                         <include name="*/${fix.includes}*.class"/>
+                     </fileset>
+                 </nbjpdareload>
+             </sequential>
+         </macrodef>
+     </target>
+     <target name="-init-debug-args">
+         <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
+             <os family="windows"/>
+         </condition>
+         <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
+             <isset property="debug.transport"/>
+         </condition>
+     </target>
+     <target depends="-init-debug-args" name="-init-macrodef-debug">
+         <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-modular-project/1">
+             <attribute default="${module.name}" name="modulename"/>
+             <attribute default="${main.class}" name="classname"/>
+             <attribute default="${debug.modulepath}" name="modulepath"/>
+             <attribute default="${debug.classpath}" name="classpath"/>
+             <element name="customizeDebuggee" optional="true"/>
+             <sequential>
+                 <j2semodularproject1:java xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" classname="@{classname}" classpath="@{classpath}" modulename="@{modulename}" modulepath="@{modulepath}">
+                     <customize>
+                         <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
+                         <customizeDebuggee/>
+                     </customize>
+                 </j2semodularproject1:java>
+             </sequential>
+         </macrodef>
+     </target>
+     <target depends="-init-source-module-properties" name="-init-macrodef-java">
+         <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-modular-project/1">
+             <attribute default="${module.name}" name="modulename"/>
+             <attribute default="${main.class}" name="classname"/>
+             <attribute default="${run.modulepath}" name="modulepath"/>
+             <attribute default="${run.upgrademodulepath}" name="upgrademodulepath"/>
+             <attribute default="${run.classpath}" name="classpath"/>
+             <attribute default="jvm" name="jvm"/>
+             <element name="customize" optional="true"/>
+             <sequential>
+                 <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" module="@{modulename}">
+                     <classpath>
+                         <path path="@{classpath}"/>
+                     </classpath>
+                     <modulepath>
+                         <path path="@{modulepath}"/>
+                     </modulepath>
+                     <upgrademodulepath>
+                         <path path="@{upgrademodulepath}"/>
+                     </upgrademodulepath>
+                     <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
+                     <redirector errorencoding="${runtime.encoding}" inputencoding="${runtime.encoding}" outputencoding="${runtime.encoding}"/>
+                     <jvmarg line="${run.jvmargs}"/>
+                     <jvmarg line="${run.jvmargs.ide}"/>
+                     <syspropertyset>
+                         <propertyref prefix="run-sys-prop."/>
+                         <mapper from="run-sys-prop.*" to="*" type="glob"/>
+                     </syspropertyset>
+                     <customize/>
+                 </java>
+             </sequential>
+         </macrodef>
+     </target>
+     <target name="-init-presetdef-jar">
+         <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-modular-project/1">
+             <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}" manifestencoding="UTF-8">
+                 <j2semodularproject1:fileset xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
+             </jar>
+         </presetdef>
+     </target>
+     <target name="-init-ap-cmdline-properties">
+         <property name="annotation.processing.enabled" value="true"/>
+         <property name="annotation.processing.processors.list" value=""/>
+         <property name="annotation.processing.processor.options" value=""/>
+         <property name="annotation.processing.run.all.processors" value="true"/>
+         <property name="javac.processorpath" value="${javac.classpath}"/>
+         <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
+     </target>
+     <target depends="-init-ap-cmdline-properties" name="-init-ap-cmdline-supported">
+         <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
+             <isfalse value="${annotation.processing.run.all.processors}"/>
+         </condition>
+         <condition else="" property="ap.proc.none.internal" value="-proc:none">
+             <isfalse value="${annotation.processing.enabled}"/>
+         </condition>
+     </target>
+     <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
+         <property name="ap.cmd.line.internal" value=""/>
+     </target>
+     <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac-depend,-init-macrodef-test,-init-macrodef-test-debug,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar,-init-ap-cmdline" name="init"/>
+     <!--
+                 ===================
+                 COMPILATION SECTION
+                 ===================
+             -->
+     <target name="-deps-jar-init" unless="built-jar.properties">
+         <property location="${build.dir}/built-jar.properties" name="built-jar.properties"/>
+         <delete file="${built-jar.properties}" quiet="true"/>
+     </target>
+     <target if="already.built.jar.${basedir}" name="-warn-already-built-jar">
 -        <echo level="warn" message="Cycle detected: Apache SIS on GeoAPI 3.1 was already built"/>
++        <echo level="warn" message="Cycle detected: Apache SIS on GeoAPI 3.0 was already built"/>
+     </target>
+     <target depends="init,-deps-jar-init" name="deps-jar" unless="no.deps">
+         <mkdir dir="${build.dir}"/>
+         <touch file="${built-jar.properties}" verbose="false"/>
+         <property file="${built-jar.properties}" prefix="already.built.jar."/>
+         <antcall target="-warn-already-built-jar"/>
+         <propertyfile file="${built-jar.properties}">
+             <entry key="${basedir}" value=""/>
+         </propertyfile>
+     </target>
+     <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
+     <target depends="init" name="-check-automatic-build">
+         <available file="${build.modules.dir}/.netbeans_automatic_build" property="netbeans.automatic.build"/>
+     </target>
+     <target depends="init" if="netbeans.automatic.build" name="-clean-after-automatic-build">
+         <antcall target="clean">
+             <param name="no.dependencies" value="true"/>
+         </antcall>
+     </target>
+     <target name="-pre-pre-compile">
+         <mkdir dir="${build.modules.dir}"/>
+     </target>
+     <target name="-pre-compile">
+         <!-- Empty placeholder for easier customization. -->
+         <!-- You can override this target in the ../build.xml file. -->
+     </target>
+     <target if="do.depend.true" name="-compile-depend">
+         <pathconvert property="build.generated.subdirs">
+             <dirset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                 <include name="*"/>
+             </dirset>
+         </pathconvert>
+         <j2semodularproject1:depend xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" srcdir="${src.dir}:${optional.main.dir}:${incubator.main.dir}:${build.generated.subdirs}"/>
+     </target>
+     <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
+         <j2semodularproject1:javac xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" gensrcdir="${build.generated.sources.dir}"/>
+         <j2semodularproject1:modsource_regexp xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" filePattern="(.*$)" modsource="${src.dir.path}" property="src.dir.path.regexp"/>
+         <echo message="Copying resources from ${src.dir}"/>
+         <copy todir="${build.modules.dir}">
+             <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+             <regexpmapper from="${src.dir.path.regexp}" to="\1/\3"/>
+         </copy>
+         <j2semodularproject1:modsource_regexp xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" filePattern="(.*$)" modsource="${optional.main.dir.path}" property="optional.main.dir.path.regexp"/>
+         <echo message="Copying resources from ${optional.main.dir}"/>
+         <copy todir="${build.modules.dir}">
+             <fileset dir="${optional.main.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+             <regexpmapper from="${optional.main.dir.path.regexp}" to="\1/\3"/>
+         </copy>
+         <j2semodularproject1:modsource_regexp xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" filePattern="(.*$)" modsource="${incubator.main.dir.path}" property="incubator.main.dir.path.regexp"/>
+         <echo message="Copying resources from ${incubator.main.dir}"/>
+         <copy todir="${build.modules.dir}">
+             <fileset dir="${incubator.main.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+             <regexpmapper from="${incubator.main.dir.path.regexp}" to="\1/\3"/>
+         </copy>
+     </target>
+     <target if="has.persistence.xml" name="-copy-persistence-xml">
+         <fail message="XXX: Not supported on MM projects"/>
+         <mkdir dir="${build.classes.dir}/META-INF"/>
+         <copy todir="${build.classes.dir}/META-INF">
+             <fileset dir="${meta.inf.dir}" includes="persistence.xml orm.xml"/>
+         </copy>
+     </target>
+     <target name="-post-compile">
+         <!-- Empty placeholder for easier customization. -->
+         <!-- You can override this target in the ../build.xml file. -->
+     </target>
+     <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
+     <target name="-pre-compile-single">
+         <!-- Empty placeholder for easier customization. -->
+         <!-- You can override this target in the ../build.xml file. -->
+     </target>
+     <target depends="init,deps-jar" name="-do-compile-single">
+         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+         <j2semodularproject1:force-recompile xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1"/>
+         <j2semodularproject1:javac xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}, module-info.java"/>
+     </target>
+     <target name="-post-compile-single">
+         <!-- Empty placeholder for easier customization. -->
+         <!-- You can override this target in the ../build.xml file. -->
+     </target>
+     <target depends="init,deps-jar,-verify-automatic-build,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
+     <!--
+                 ====================
+                 JAR BUILDING SECTION
+                 ====================
+             -->
+     <target depends="init,compile" name="-check-module-main-class">
+         <condition property="do.module.main.class">
+             <and>
+                 <available file="${module.dir}/module-info.class"/>
+                 <isset property="main.class.check.available"/>
+             </and>
+         </condition>
+     </target>
+     <target depends="init" name="-pre-pre-jar">
+         <dirname file="${dist.jar}" property="dist.jar.dir"/>
+         <mkdir dir="${dist.jar.dir}"/>
+     </target>
+     <target name="-pre-jar">
+         <!-- Empty placeholder for easier customization. -->
+         <!-- You can override this target in the ../build.xml file. -->
+     </target>
+     <target name="-pre-single-jar"/>
+     <target depends="-pre-single-jar" if="module.jar.filename" name="-make-single-jar">
+         <jar basedir="${module.dir}" compress="${jar.compress}" destfile="${dist.dir}/${module.jar.filename}" excludes="${dist.archive.excludes}" manifestencoding="UTF-8"/>
+     </target>
+     <target depends="init,compile,-pre-pre-jar,-pre-jar,-main-module-check-condition" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
+         <property location="${build.modules.dir}" name="build.modules.dir.resolved"/>
+         <dirset dir="${build.modules.dir.resolved}" id="do.jar.dirs" includes="*"/>
+         <pathconvert property="do.jar.dir.list" refid="do.jar.dirs">
+             <identitymapper/>
+         </pathconvert>
+         <j2semodularproject1:for-paths xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" paths="${do.jar.dir.list}">
+             <local name="module.jar.filename"/>
+             <local name="module.jar.name.tmp"/>
+             <basename file="${entry}" property="module.jar.name.tmp"/>
+             <property name="module.jar.filename" value="${module.jar.name.tmp}.jar"/>
+             <antcall inheritRefs="true" target="-make-single-jar">
+                 <param name="module.jar.filename" value="${module.jar.filename}"/>
+                 <param location="${entry}" name="module.dir"/>
+             </antcall>
+         </j2semodularproject1:for-paths>
+         <condition property="named.module.internal">
+             <and>
+                 <isset property="module.name"/>
+                 <length length="0" string="${module.name}" when="greater"/>
+             </and>
+         </condition>
+         <condition property="unnamed.module.internal">
+             <not>
+                 <isset property="named.module.internal"/>
+             </not>
+         </condition>
+         <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+         <property location="${dist.jar}" name="dist.jar.resolved"/>
+         <pathconvert property="run.classpath.with.dist.jar">
+             <path path="${run.classpath}"/>
+             <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
+         </pathconvert>
+         <pathconvert property="run.modulepath.with.dist.jar">
+             <path path="${run.modulepath}"/>
+             <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
+         </pathconvert>
+         <condition else="" property="jar.usage.message.module.path" value=" --module-path ${run.modulepath.with.dist.jar}">
+             <and>
+                 <isset property="modules.supported.internal"/>
+                 <length length="0" string="${run.modulepath.with.dist.jar}" when="greater"/>
+             </and>
+         </condition>
+         <condition else="" property="jar.usage.message.class.path" value=" -cp ${run.classpath.with.dist.jar}">
+             <length length="0" string="${run.classpath.with.dist.jar}" when="greater"/>
+         </condition>
+         <condition else=" ${main.class}" property="jar.usage.message.main.class" value=" -m ${module.name}/${main.class}">
+             <isset property="named.module.internal"/>
+         </condition>
+         <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java}${jar.usage.message.module.path}${jar.usage.message.class.path}${jar.usage.message.main.class}">
+             <isset property="main.class.available"/>
+         </condition>
+         <condition else="debug" property="jar.usage.level" value="info">
+             <isset property="main.class.available"/>
+         </condition>
+         <echo level="${jar.usage.level}" message="${jar.usage.message}"/>
+     </target>
+     <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-jar" name="-do-jar-without-libraries"/>
+     <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-with-libraries"/>
+     <target name="-post-jar">
+         <!-- Empty placeholder for easier customization. -->
+         <!-- You can override this target in the ../build.xml file. -->
+     </target>
+     <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
+     <target depends="init,compile,-pre-jar,-do-jar,-post-jar,deploy" description="Build JAR." name="jar"/>
+     <!--
+                 =================
+                 DEPLOY SECTION
+                 =================
+             -->
+     <target name="-pre-deploy">
+         <!-- Empty placeholder for easier customization. -->
+         <!-- You can override this target in the ../build.xml file. -->
+     </target>
+     <target depends="init" name="-check-jlink">
+         <condition property="do.jlink.internal">
+             <and>
+                 <istrue value="${do.jlink}"/>
+                 <isset property="do.archive"/>
+             </and>
+         </condition>
+     </target>
+     <target depends="init,-do-jar,-post-jar,-pre-deploy,-check-jlink,-main-module-set" if="do.jlink.internal" name="-do-deploy">
+         <delete dir="${dist.jlink.dir}" failonerror="false" quiet="true"/>
+         <property name="jlink.launcher.name" value="${application.title}"/>
+         <pathconvert pathsep="," property="jlink.modulelist.internal">
+             <fileset dir="${dist.dir}" includes="*.jar"/>
+             <mapper>
+                 <chainedmapper>
+                     <flattenmapper/>
+                     <globmapper from="*.jar" to="*"/>
+                 </chainedmapper>
+             </mapper>
+         </pathconvert>
+         <condition else="${jlink.modulelist.internal}" property="jlink.add.modules" value="${jlink.modulelist.internal},${jlink.additionalmodules}">
+             <and>
+                 <isset property="jlink.additionalmodules"/>
+                 <length length="0" string="${jlink.additionalmodules}" when="greater"/>
+             </and>
+         </condition>
+         <condition property="jlink.do.strip.internal">
+             <and>
+                 <isset property="jlink.strip"/>
+                 <istrue value="${jlink.strip}"/>
+             </and>
+         </condition>
+         <condition property="jlink.do.additionalparam.internal">
+             <and>
+                 <isset property="jlink.additionalparam"/>
+                 <length length="0" string="${jlink.additionalparam}" when="greater"/>
+             </and>
+         </condition>
+         <condition property="jlink.do.launcher.internal">
+             <and>
+                 <istrue value="${jlink.launcher}"/>
+                 <isset property="module.name"/>
+                 <length length="0" string="${module.name}" when="greater"/>
+                 <isset property="main.class.available"/>
+             </and>
+         </condition>
+         <property name="platform.jlink" value="${jdk.home}/bin/jlink"/>
+         <property name="jlink.systemmodules.internal" value="${jdk.home}/jmods"/>
+         <exec executable="${platform.jlink}">
+             <arg value="--module-path"/>
+             <arg path="${jlink.systemmodules.internal}:${run.modulepath}:${dist.dir}"/>
+             <arg value="--add-modules"/>
+             <arg value="${jlink.add.modules}"/>
+             <arg if:set="jlink.do.strip.internal" value="--strip-debug"/>
+             <arg if:set="jlink.do.launcher.internal" value="--launcher"/>
+             <arg if:set="jlink.do.launcher.internal" value="${jlink.launcher.name}=${module.name}/${main.class}"/>
+             <arg if:set="jlink.do.additionalparam.internal" line="${jlink.additionalparam}"/>
+             <arg value="--output"/>
+             <arg value="${dist.jlink.output}"/>
+         </exec>
+     </target>
+     <target name="-post-deploy">
+         <!-- Empty placeholder for easier customization. -->
+         <!-- You can override this target in the ../build.xml file. -->
+     </target>
+     <target depends="-do-jar,-post-jar,-pre-deploy,-do-deploy,-post-deploy" name="deploy"/>
+     <!--
+                 =================
+                 EXECUTION SECTION
+                 =================
+             -->
+     <target name="-check-main-class">
+         <fail unless="main.class">No main class specified</fail>
+     </target>
+     <target depends="init,compile,-check-main-class,-main-module-check" description="Run a main class." name="run">
+         <property name="main.class.relativepath" refid="main.class.relativepath"/>
+         <pathconvert pathsep="," property="src.dir.list" refid="have.sources.set"/>
+         <j2semodularproject1:modsource_regexp xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" filePattern="(.*$)" modsource="${src.dir.path}" property="run.src.dir.path.regexp"/>
+         <j2semodularproject1:java xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1">
+             <customize>
+                 <arg line="${application.args}"/>
+             </customize>
+         </j2semodularproject1:java>
+     </target>
+     <target name="-main-module-set" unless="module.name">
+         <condition else="${main.class}" property="check.class.name" value="${run.class}">
+             <isset property="run.class"/>
+         </condition>
+         <condition property="run.modules.dir" value="${build.modules.dir}">
+             <not>
+                 <isset property="run.modules.dir"/>
+             </not>
+         </condition>
+         <resources id="main.class.relativepath">
+             <mappedresources>
+                 <string value="${check.class.name}"/>
+                 <unpackagemapper from="*" to="*.class"/>
+             </mappedresources>
+         </resources>
+         <property location="${run.modules.dir}" name="run.modules.dir.location"/>
+         <pathconvert property="module.name">
+             <fileset dir="${run.modules.dir}" includes="**/${toString:main.class.relativepath}"/>
+             <regexpmapper from="\Q${run.modules.dir.location}${file.separator}\E([^${file.separator.string}]+)\Q${file.separator}\E.*\.class" to="\1"/>
+         </pathconvert>
+     </target>
+     <target depends="-main-module-set" name="-main-module-check">
+         <fail message="Could not determine module of the main class and module.name is not set">
+             <condition>
+                 <or>
+                     <not>
+                         <isset property="module.name"/>
+                     </not>
+                     <length length="0" string="${module.name}" when="equal"/>
+                 </or>
+             </condition>
+         </fail>
+     </target>
+     <target depends="-main-module-set" if="main.class.available" name="-main-module-check-condition">
+         <fail message="Could not determine module of the main class and module.name is not set">
+             <condition>
+                 <or>
+                     <not>
+                         <isset property="module.name"/>
+                     </not>
+                     <length length="0" string="${module.name}" when="equal"/>
+                 </or>
+             </condition>
+         </fail>
+     </target>
+     <target name="-do-not-recompile">
+         <property name="javac.includes.binary" value=""/>
+     </target>
+     <target depends="init,compile-single,-main-module-check" name="run-single">
+         <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+         <j2semodularproject1:java xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" classname="${run.class}"/>
+     </target>
+     <target depends="init,compile-test-single,-init-test-run-module-properties,-main-module-check" name="run-test-with-main">
+         <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+         <j2semodularproject1:java xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" classname="${run.class}" classpath="${run.test.classpath}" modulepath="${run.test.modulepath}">
+             <customize>
+                 <jvmarg line="${run.test.jvmargs}"/>
+             </customize>
+         </j2semodularproject1:java>
+     </target>
+     <!--
+                 =================
+                 DEBUGGING SECTION
+                 =================
+             -->
+     <target name="-debug-init">
+         <condition else="${main.class}" property="run.class" value="${debug.class}">
+             <isset property="debug.class"/>
+         </condition>
+         <fail message="debug.class or main.class property is not set" unless="run.class"/>
+     </target>
+     <target depends="init,-debug-init,-main-module-check" if="netbeans.home" name="-debug-start-debugger">
+         <j2semodularproject1:nbjpdastart xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" name="${debug.class}"/>
+     </target>
+     <target depends="init,-debug-init,-main-module-check" if="netbeans.home" name="-debug-start-debugger-main-test">
+         <j2semodularproject1:nbjpdastart xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" classpath="${debug.test.classpath}" name="${debug.class}"/>
+     </target>
+     <target depends="init,compile,-debug-init,-main-module-check" name="-debug-start-debuggee">
+         <j2semodularproject1:debug xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" classname="${run.class}">
+             <customizeDebuggee>
+                 <arg line="${application.args}"/>
+             </customizeDebuggee>
+         </j2semodularproject1:debug>
+     </target>
+     <target depends="init,compile,-debug-init,-main-module-check,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
+     <target depends="init,-debug-init,-main-module-check" if="netbeans.home" name="-debug-start-debugger-stepinto">
+         <j2semodularproject1:nbjpdastart xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" stopclassname="${debug.class}"/>
+     </target>
+     <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
+     <target depends="init,compile-single,-debug-init,-main-module-check" if="netbeans.home" name="-debug-start-debuggee-single">
+         <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
+         <j2semodularproject1:debug xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" classname="${debug.class}"/>
+     </target>
+     <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
+     <target depends="init,compile-test-single,-debug-init,-main-module-check" if="netbeans.home" name="-debug-start-debuggee-main-test">
+         <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
+         <j2semodularproject1:debug xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" classname="${debug.class}" classpath="${debug.test.classpath}"/>
+     </target>
+     <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
+     <target depends="init" name="-pre-debug-fix">
+         <fail unless="fix.includes">Must set fix.includes</fail>
+         <property name="javac.includes" value="${fix.includes}.java"/>
+     </target>
+     <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
+         <property location="${build.modules.dir}" name="debug.modules.dir"/>
+         <j2semodularproject1:nbjpdareload xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1"/>
+     </target>
+     <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
+     <!--
+                 =================
+                 PROFILING SECTION
+                 =================
+             -->
+     <!--
+                 pre NB7.2 profiler integration
+             -->
+     <target depends="profile-init,compile" description="Profile a project in the IDE." if="profiler.info.jvmargs.agent" name="-profile-pre72">
+         <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
+         <nbprofiledirect>
+             <classpath>
+                 <path path="${run.classpath}"/>
+             </classpath>
+         </nbprofiledirect>
+         <profile/>
+     </target>
+     <target depends="profile-init,compile-single" description="Profile a selected class in the IDE." if="profiler.info.jvmargs.agent" name="-profile-single-pre72">
+         <fail unless="profile.class">Must select one file in the IDE or set profile.class</fail>
+         <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
+         <nbprofiledirect>
+             <classpath>
+                 <path path="${run.classpath}"/>
+             </classpath>
+         </nbprofiledirect>
+         <profile classname="${profile.class}"/>
+     </target>
+     <target depends="profile-init,compile-single" if="profiler.info.jvmargs.agent" name="-profile-applet-pre72">
+         <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
+         <nbprofiledirect>
+             <classpath>
+                 <path path="${run.classpath}"/>
+             </classpath>
+         </nbprofiledirect>
+         <profile classname="sun.applet.AppletViewer">
+             <customize>
+                 <arg value="${applet.url}"/>
+             </customize>
+         </profile>
+     </target>
+     <target depends="-init-macrodef-junit,profile-init,compile-test-single" if="profiler.info.jvmargs.agent" name="-profile-test-single-pre72">
+         <fail unless="netbeans.home">This target only works when run from inside the NetBeans IDE.</fail>
+         <nbprofiledirect>
+             <classpath>
+                 <path path="${run.test.classpath}"/>
+             </classpath>
+         </nbprofiledirect>
+         <j2semodularproject1:junit xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" excludes="${excludes}" includes="${includes}" testincludes="${profile.class}" testmethods="">
+             <customize>
+                 <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
+                 <env key="${profiler.info.pathvar}" path="${profiler.info.agentpath}:${profiler.current.path}"/>
+                 <jvmarg value="${profiler.info.jvmargs.agent}"/>
+                 <jvmarg line="${profiler.info.jvmargs}"/>
+                 <classpath>
+                     <path path="${run.test.classpath}"/>
+                 </classpath>
+             </customize>
+         </j2semodularproject1:junit>
+     </target>
+     <!--
+                 end of pre NB72 profiling section
+             -->
+     <target if="netbeans.home" name="-profile-check">
+         <condition property="profiler.configured">
+             <or>
+                 <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-agentpath:"/>
+                 <contains casesensitive="true" string="${run.jvmargs.ide}" substring="-javaagent:"/>
+             </or>
+         </condition>
+     </target>
+     <target depends="-profile-check,-profile-pre72" description="Profile a project in the IDE." if="profiler.configured" name="profile" unless="profiler.info.jvmargs.agent">
+         <startprofiler/>
+         <antcall target="run"/>
+     </target>
+     <target depends="-profile-check,-profile-single-pre72" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-single" unless="profiler.info.jvmargs.agent">
+         <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+         <startprofiler/>
+         <antcall target="run-single"/>
+     </target>
+     <target depends="-profile-test-single-pre72" description="Profile a selected test in the IDE." name="profile-test-single"/>
+     <target depends="-profile-check" description="Profile a selected test in the IDE." if="profiler.configured" name="profile-test" unless="profiler.info.jvmargs">
+         <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
+         <startprofiler/>
+         <antcall target="test-single"/>
+     </target>
+     <target depends="-profile-check" description="Profile a selected class in the IDE." if="profiler.configured" name="profile-test-with-main">
+         <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
+         <startprofiler/>
+         <antcall target="run-test-with-main"/>
+     </target>
+     <target depends="-profile-check,-profile-applet-pre72" if="profiler.configured" name="profile-applet" unless="profiler.info.jvmargs.agent">
+         <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
+         <startprofiler/>
+         <antcall target="run-applet"/>
+     </target>
+     <!--
+                 ===============
+                 JAVADOC SECTION
+                 ===============
+             -->
+     <target depends="init" if="have.sources" name="-javadoc-build">
+         <mkdir dir="${dist.javadoc.dir}"/>
+         <condition else="" property="javadoc.endorsed.classpath.cmd.line.arg" value="-J${endorsed.classpath.cmd.line.arg}">
+             <and>
+                 <isset property="endorsed.classpath.cmd.line.arg"/>
+                 <not>
+                     <equals arg1="${endorsed.classpath.cmd.line.arg}" arg2=""/>
+                 </not>
+             </and>
+         </condition>
+         <condition else="" property="bug5101868workaround" value="*.java">
+             <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
+         </condition>
+         <condition else="" property="javadoc.html5.cmd.line.arg" value="-html5">
+             <and>
+                 <isset property="javadoc.html5"/>
+                 <available file="${jdk.home}${file.separator}lib${file.separator}jrt-fs.jar"/>
+             </and>
+         </condition>
+         <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version [...]
+             <classpath>
+                 <path path="${javac.classpath}"/>
+             </classpath>
+             <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
+                 <filename name="**/*.java"/>
+             </fileset>
+             <fileset dir="${optional.main.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
+                 <filename name="**/*.java"/>
+             </fileset>
+             <fileset dir="${incubator.main.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
+                 <filename name="**/*.java"/>
+             </fileset>
+             <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                 <include name="**/*.java"/>
+                 <exclude name="*.java"/>
+             </fileset>
+             <arg line="${javadoc.endorsed.classpath.cmd.line.arg}"/>
+             <arg line="${javadoc.html5.cmd.line.arg}"/>
+         </javadoc>
+         <copy todir="${dist.javadoc.dir}">
+             <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
+                 <filename name="**/doc-files/**"/>
+             </fileset>
+             <fileset dir="${optional.main.dir}" excludes="${excludes}" includes="${includes}">
+                 <filename name="**/doc-files/**"/>
+             </fileset>
+             <fileset dir="${incubator.main.dir}" excludes="${excludes}" includes="${includes}">
+                 <filename name="**/doc-files/**"/>
+             </fileset>
+             <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
+                 <include name="**/doc-files/**"/>
+             </fileset>
+         </copy>
+     </target>
+     <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
+         <nbbrowse file="${dist.javadoc.dir}/index.html"/>
+     </target>
+     <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
+     <!--
+                 =========================
+                 TEST COMPILATION SECTION
+                 =========================
+             -->
+     <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
+         <mkdir dir="${build.test.modules.dir}"/>
+     </target>
+     <target name="-pre-compile-test">
+         <!-- Empty placeholder for easier customization. -->
+         <!-- You can override this target in the ../build.xml file. -->
+     </target>
+     <target depends="-init-source-module-properties" name="-init-test-run-module-properties">
+         <fileset dir="${build.test.modules.dir}" id="run.test.packages.internal" includes="**/*.class"/>
+         <property location="${build.test.modules.dir}" name="build.test.modules.dir.abs.internal"/>
+         <pathconvert pathsep=" " property="run.test.addexports.internal" refid="run.test.packages.internal">
+             <chainedmapper>
+                 <filtermapper>
+                     <replacestring from="${build.test.modules.dir.abs.internal}${file.separator}" to=""/>
+                 </filtermapper>
+                 <regexpmapper from="^([^${file.separator.string}]*)\Q${file.separator}\E(.*)\Q${file.separator}\E.*\.class$$" to="\1${path.separator}\2"/>
+                 <filtermapper>
+                     <uniqfilter/>
+                     <replacestring from="${file.separator}" to="."/>
+                 </filtermapper>
+                 <regexpmapper from="([^${file.separator.string}]+)${path.separator}(.*)" to="--add-exports \1/\2=ALL-UNNAMED"/>
+             </chainedmapper>
+         </pathconvert>
+         <property location="${build.test.modules.dir}" name="build.test.modules.location"/>
+         <pathconvert pathsep="," property="run.test.addmodules.list">
+             <map from="${build.test.modules.location}${file.separator}" to=""/>
+             <dirset dir="${build.test.modules.dir}" includes="*"/>
+             <chainedmapper>
+                 <filtermapper>
+                     <uniqfilter/>
+                 </filtermapper>
+             </chainedmapper>
+         </pathconvert>
+         <pathconvert pathsep=" " property="run.test.patchmodules.list">
+             <dirset dir="${build.test.modules.dir}" includes="*">
+                 <custom classname="netbeans.ModuleInfoSelector" classpath="${netbeans.modular.tasks.dir}/out">
+                     <param name="extension" value="class"/>
+                 </custom>
+             </dirset>
+             <chainedmapper>
+                 <filtermapper>
+                     <uniqfilter/>
+                 </filtermapper>
+                 <regexpmapper from=".*\Q${file.separator}\E([^${file.separator.string}]+)$" to="--patch-module \1=\0"/>
+             </chainedmapper>
+         </pathconvert>
+         <j2semodularproject1:coalesce_keyvalue xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" entrySep="--patch-module " multiSep="${path.separator}" property="run.test.patchmodules" value="${run.test.patchmodules.list}" valueSep="="/>
+         <condition else="" property="run.test.addmodules.internal" value="--add-modules ${run.test.addmodules.list}">
+             <isset property="run.test.addmodules.list"/>
+         </condition>
+         <pathconvert pathsep=" " property="run.test.addreads.internal">
+             <map from="${build.test.modules.location}" to=""/>
+             <dirset dir="${build.test.modules.dir}" includes="*"/>
+             <chainedmapper>
+                 <regexpmapper from="^\Q${build.test.modules.location}${file.separator}\E(.*)" to="\1"/>
+                 <regexpmapper from="(.*)" to="--add-reads \1=ALL-UNNAMED"/>
+                 <filtermapper>
+                     <uniqfilter/>
+                 </filtermapper>
+             </chainedmapper>
+         </pathconvert>
+         <property name="run.test.jvmargs" value="${run.test.addmodules.internal} ${run.test.addreads.internal} ${run.test.addexports.internal} ${run.test.patchmodules}"/>
+     </target>
+     <target depends="-init-source-module-properties" name="-init-test-javac-module-properties">
+         <pathconvert pathsep=" " property="compile.test.patchmodule.internal" refid="have.tests.patchset">
+             <regexpmapper from="(.*\Q${file.separator}\E)([^${file.separator.string}]+)\Q${file.separator}\E(.*)$$" to="--patch-module \2=\1\2${file.separator.string}\3"/>
+         </pathconvert>
+         <pathconvert pathsep=" " property="compile.test.addreads">
+             <union refid="have.tests.set"/>
+             <chainedmapper>
+                 <firstmatchmapper>
+                     <regexpmapper from="${have.tests.test.src.dir.regexp}" to="\1"/>
+                 </firstmatchmapper>
+                 <regexpmapper from="(.*)" to="--add-reads \1=ALL-UNNAMED"/>
+                 <filtermapper>
+                     <uniqfilter/>
+                 </filtermapper>
+             </chainedmapper>
+         </pathconvert>
+         <j2semodularproject1:coalesce_keyvalue xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" entrySep="--patch-module " multiSep="${path.separator}" property="compile.test.patchmodules" value="${compile.test.patchmodule.internal}" valueSep="="/>
+         <property name="javac.test.moduleargs" value="${compile.test.patchmodules} ${compile.test.addreads}"/>
+     </target>
+     <target depends="-init-test-javac-module-properties" name="-init-test-module-properties">
+         <property location="${build.modules.dir}" name="test.module.build.location"/>
+         <property name="test.source.modulepath" value="${test.src.dir}/*/${test.src.dir.path}:${optional.test.dir}/*/${optional.test.dir.path}:${incubator.test.dir}/*/${incubator.test.dir.path}:${local.test.dir}/*/${local.test.dir.path}"/>
+         <property name="test.compile.modulepath" value="${javac.test.modulepath}:${build.modules.dir}"/>
+         <macrodef name="test-javac" uri="http://www.netbeans.org/ns/j2se-modular-project/1">
+             <attribute default="${includes}" name="includes"/>
+             <attribute default="${excludes}" name="excludes"/>
+             <element implicit="true" name="additionalargs" optional="true"/>
+             <sequential>
+                 <j2semodularproject1:javac xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" apgeneratedsrcdir="${build.test.modules.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.modules.dir}" excludes="@{excludes}" includes="@{includes}" modulepath="${test.compile.modulepath}" modulesourcepath="${test.source.modulepath}" processorpath="${javac.test.processorpath}">
+                     <customize>
+                         <compilerarg line="${javac.test.moduleargs}"/>
+                         <additionalargs/>
+                     </customize>
+                 </j2semodularproject1:javac>
+             </sequential>
+         </macrodef>
+     </target>
+     <target if="do.depend.true" name="-compile-test-depend">
+         <j2semodularproject1:depend xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}:${optional.test.dir}:${incubator.test.dir}:${local.test.dir}"/>
+     </target>
+     <target depends="init,deps-jar,compile,-init-test-module-properties,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
+         <j2semodularproject1:test-javac xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1"/>
+         <j2semodularproject1:modsource_regexp xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" filePattern="(.*$)" modsource="${test.src.dir.path}" property="test.src.dir.path.regexp"/>
+         <echo message="Copying resources from ${test.src.dir}"/>
+         <copy todir="${build.test.modules.dir}">
+             <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+             <regexpmapper from="${test.src.dir.path.regexp}" to="\1/\3"/>
+         </copy>
+         <j2semodularproject1:modsource_regexp xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" filePattern="(.*$)" modsource="${optional.test.dir.path}" property="optional.test.dir.path.regexp"/>
+         <echo message="Copying resources from ${optional.test.dir}"/>
+         <copy todir="${build.test.modules.dir}">
+             <fileset dir="${optional.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+             <regexpmapper from="${optional.test.dir.path.regexp}" to="\1/\3"/>
+         </copy>
+         <j2semodularproject1:modsource_regexp xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" filePattern="(.*$)" modsource="${incubator.test.dir.path}" property="incubator.test.dir.path.regexp"/>
+         <echo message="Copying resources from ${incubator.test.dir}"/>
+         <copy todir="${build.test.modules.dir}">
+             <fileset dir="${incubator.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+             <regexpmapper from="${incubator.test.dir.path.regexp}" to="\1/\3"/>
+         </copy>
+         <j2semodularproject1:modsource_regexp xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" filePattern="(.*$)" modsource="${local.test.dir.path}" property="local.test.dir.path.regexp"/>
+         <echo message="Copying resources from ${local.test.dir}"/>
+         <copy todir="${build.test.modules.dir}">
+             <fileset dir="${local.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+             <regexpmapper from="${local.test.dir.path.regexp}" to="\1/\3"/>
+         </copy>
+     </target>
+     <target name="-post-compile-test">
+         <!-- Empty placeholder for easier customization. -->
+         <!-- You can override this target in the ../build.xml file. -->
+     </target>
+     <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
+     <target name="-pre-compile-test-single">
+         <!-- Empty placeholder for easier customization. -->
+         <!-- You can override this target in the ../build.xml file. -->
+     </target>
+     <target depends="init,deps-jar,compile,-init-test-module-properties,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
+         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
+         <j2semodularproject1:force-recompile xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" destdir="${build.test.modules.dir}"/>
+         <j2semodularproject1:test-javac xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" includes="${javac.includes}"/>
+         <j2semodularproject1:modsource_regexp xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" filePattern="(.*$)" modsource="${test.src.dir.path}" property="test.src.dir.path.regexp"/>
+         <echo message="Copying resources from ${test.src.dir}"/>
+         <copy todir="${build.test.modules.dir}">
+             <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+             <regexpmapper from="${test.src.dir.path.regexp}" to="\1/\3"/>
+         </copy>
+         <j2semodularproject1:modsource_regexp xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" filePattern="(.*$)" modsource="${optional.test.dir.path}" property="optional.test.dir.path.regexp"/>
+         <echo message="Copying resources from ${optional.test.dir}"/>
+         <copy todir="${build.test.modules.dir}">
+             <fileset dir="${optional.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+             <regexpmapper from="${optional.test.dir.path.regexp}" to="\1/\3"/>
+         </copy>
+         <j2semodularproject1:modsource_regexp xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" filePattern="(.*$)" modsource="${incubator.test.dir.path}" property="incubator.test.dir.path.regexp"/>
+         <echo message="Copying resources from ${incubator.test.dir}"/>
+         <copy todir="${build.test.modules.dir}">
+             <fileset dir="${incubator.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+             <regexpmapper from="${incubator.test.dir.path.regexp}" to="\1/\3"/>
+         </copy>
+         <j2semodularproject1:modsource_regexp xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" filePattern="(.*$)" modsource="${local.test.dir.path}" property="local.test.dir.path.regexp"/>
+         <echo message="Copying resources from ${local.test.dir}"/>
+         <copy todir="${build.test.modules.dir}">
+             <fileset dir="${local.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+             <regexpmapper from="${local.test.dir.path.regexp}" to="\1/\3"/>
+         </copy>
+     </target>
+     <target name="-post-compile-test-single">
+         <!-- Empty placeholder for easier customization. -->
+         <!-- You can override this target in the ../build.xml file. -->
+     </target>
+     <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
+     <!--
+                 =======================
+                 TEST EXECUTION SECTION
+                 =======================
+             -->
+     <target depends="init" if="have.tests" name="-pre-test-run">
+         <mkdir dir="${build.test.results.dir}"/>
+     </target>
+     <target name="-init-test-run">
+         <property name="run.modules.dir" value="${build.test.modules.dir}"/>
+     </target>
+     <target depends="init,compile-test,-init-test-run-module-properties,-pre-test-run" if="have.tests" name="-do-test-run">
+         <j2semodularproject1:test xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" includes="${includes}" testincludes="**/*Test.java"/>
+     </target>
+     <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
+         <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
+     </target>
+     <target depends="init" if="have.tests" name="test-report"/>
+     <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
+     <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
+     <target depends="init" if="have.tests" name="-pre-test-run-single">
+         <mkdir dir="${build.test.results.dir}"/>
+     </target>
+     <target depends="init,compile-test-single,-init-test-run-module-properties,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
+         <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
+         <j2semodularproject1:test xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" excludes="" includes="${test.includes}" testincludes="${test.includes}"/>
+     </target>
+     <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
+         <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
+     </target>
+     <target depends="init,compile-test-single,-init-test-run-module-properties,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
+     <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single-method">
+         <fail unless="test.class">Must select some files in the IDE or set test.class</fail>
+         <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
+         <j2semodularproject1:test xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" excludes="" includes="${javac.includes}" testincludes="${test.class}" testmethods="${test.method}"/>
+     </target>
+     <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method" if="have.tests" name="-post-test-run-single-method">
+         <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
+     </target>
+     <target depends="init,compile-test-single,-init-test-run-module-properties,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
+     <!--
+                 =======================
+                 TEST DEBUGGING SECTION
+                 =======================
+             -->
+     <target depends="init,compile-test-single,-init-test-run-module-properties,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test">
+         <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
+         <j2semodularproject1:test-debug xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" excludes="" includes="${javac.includes}" testClass="${test.class}" testincludes="${javac.includes}"/>
+     </target>
+     <target depends="init,compile-test-single,-init-test-run-module-properties,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test-method">
+         <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
+         <fail unless="test.method">Must select some method in the IDE or set test.method</fail>
+         <j2semodularproject1:test-debug xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" excludes="" includes="${javac.includes}" testClass="${test.class}" testMethod="${test.method}" testincludes="${test.class}" testmethods="${test.method}"/>
+     </target>
+     <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
+         <j2semodularproject1:nbjpdastart xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1" classpath="${debug.test.classpath}" name="${test.class}"/>
+     </target>
+     <target depends="init,compile-test-single,-init-test-run-module-properties,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
+     <target depends="init,compile-test-single,-init-test-run-module-properties,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/>
+     <target depends="debug-test-method" name="debug-single-method"/>
+     <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
+         <property name="debug.modules.dir" value="${build.test.modules.dir}"/>
+         <j2semodularproject1:nbjpdareload xmlns:j2semodularproject1="http://www.netbeans.org/ns/j2se-modular-project/1"/>
+     </target>
+     <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
+     <!--
+                 =========================
+                 APPLET EXECUTION SECTION
+                 =========================
+             -->
+     <target name="run-applet">
+         <fail message="Applets are no longer supported by JDK 9"/>
+     </target>
+     <!--
+                 =========================
+                 APPLET DEBUGGING  SECTION
+                 =========================
+             -->
+     <target name="-debug-start-debuggee-applet">
+         <fail message="Applets are no longer supported by JDK 9"/>
+     </target>
+     <target name="debug-applet">
+         <fail message="Applets are no longer supported by JDK 9"/>
+     </target>
+     <!--
+                 ===============
+                 CLEANUP SECTION
+                 ===============
+             -->
+     <target name="-deps-clean-init" unless="built-clean.properties">
+         <property location="${build.dir}/built-clean.properties" name="built-clean.properties"/>
+         <delete file="${built-clean.properties}" quiet="true"/>
+     </target>
+     <target if="already.built.clean.${basedir}" name="-warn-already-built-clean">
 -        <echo level="warn" message="Cycle detected: Apache SIS on GeoAPI 3.1 was already built"/>
++        <echo level="warn" message="Cycle detected: Apache SIS on GeoAPI 3.0 was already built"/>
+     </target>
+     <target depends="init,-deps-clean-init" name="deps-clean" unless="no.deps">
+         <mkdir dir="${build.dir}"/>
+         <touch file="${built-clean.properties}" verbose="false"/>
+         <property file="${built-clean.properties}" prefix="already.built.clean."/>
+         <antcall target="-warn-already-built-clean"/>
+         <propertyfile file="${built-clean.properties}">
+             <entry key="${basedir}" value=""/>
+         </propertyfile>
+     </target>
+     <target depends="init" name="-do-clean">
+         <delete dir="${build.dir}"/>
+         <delete dir="${dist.jlink.output}"/>
+         <delete dir="${dist.dir}" followsymlinks="false" includeemptydirs="true"/>
+     </target>
+     <target name="-post-clean">
+         <!-- Empty placeholder for easier customization. -->
+         <!-- You can override this target in the ../build.xml file. -->
+     </target>
+     <target name="-recompile-netbeans-tasks-after-clean">
+         <antcall inheritall="false" target="-init-compile-netbeans-tasks"/>
+     </target>
+     <target depends="init,deps-clean,-do-clean,-recompile-netbeans-tasks-after-clean,-post-clean" description="Clean build products." name="clean"/>
+     <target name="-check-call-dep">
+         <property file="${call.built.properties}" prefix="already.built."/>
+         <condition property="should.call.dep">
+             <and>
+                 <not>
+                     <isset property="already.built.${call.subproject}"/>
+                 </not>
+                 <available file="${call.script}"/>
+             </and>
+         </condition>
+     </target>
+     <target depends="-check-call-dep" if="should.call.dep" name="-maybe-call-dep">
+         <ant antfile="${call.script}" inheritall="false" target="${call.target}">
+             <propertyset>
+                 <propertyref prefix="transfer."/>
+                 <mapper from="transfer.*" to="*" type="glob"/>
+             </propertyset>
+         </ant>
+     </target>
+ </project>
diff --cc netbeans-project/nbproject/genfiles.properties
index 0000000000,78b6aa9139..f9d4ee2e07
mode 000000,100644..100644
--- a/netbeans-project/nbproject/genfiles.properties
+++ b/netbeans-project/nbproject/genfiles.properties
@@@ -1,0 -1,8 +1,8 @@@
+ # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+ # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+ 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=34d89540
++nbproject/build-impl.xml.script.CRC32=3c783bf9
+ nbproject/build-impl.xml.stylesheet.CRC32=d1ebcf0f@1.22
diff --cc netbeans-project/nbproject/project.properties
index 0000000000,3145fef897..8413e38215
mode 000000,100644..100644
--- a/netbeans-project/nbproject/project.properties
+++ b/netbeans-project/nbproject/project.properties
@@@ -1,0 -1,189 +1,186 @@@
+ #
+ # 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.
+ #
+ 
+ #
+ # SIS project file for NetBeans.
+ #
+ application.title    = Spatial Information System (SIS)
+ application.vendor   = Apache
+ application.homepage = https://sis.apache.org/
+ application.desc     = Apache SIS is a free software, Java language library for developing geospatial applications.
+ project.license      = apache20
+ project.licensePath  = ../parent/LicenseHeader.txt
+ work.dir             = ${build.dir}
+ source.encoding      = UTF-8
+ javac.source         = 16
+ javac.target         = 16
+ platform.active      = default_platform
+ junit.forkmode       = once
+ module.name          = org.apache.sis.test.uncommitted
+ javac.compilerargs   = ${test.options} \
+                        -Xlint:all -Xdoclint:syntax,html,reference,missing/protected,accessibility/protected
+ run.jvmargs          = ${test.options} ${read.options} -enableassertions \
+                        -Djava.util.logging.config.file=../parent/logging.properties \
+                        -Dorg.apache.sis.test.extensive=true \
+                        -Dorg.apache.sis.test.verbose=true
+ 
+ #
+ # Source directories relative to this "netbeans" directory.
+ # The `src.dir` and `test.src.dir` properties could be named `endorsed.main.dir`
+ # and `endorsed.test.dir` for consistency with other properties, but the property
+ # names seem to be hard-coded in some places in NetBeans generated `build-impl`.
+ #
+ src.dir                 = ../endorsed/src
+ test.src.dir            = ../endorsed/src
+ optional.main.dir       = ../optional/src
+ optional.test.dir       = ../optional/src
+ incubator.main.dir      = ../incubator/src
+ incubator.test.dir      = ../incubator/src
+ local.test.dir          = src-local
+ src.dir.path            = main
+ test.src.dir.path       = test
+ optional.main.dir.path  = main
+ optional.test.dir.path  = test
+ incubator.main.dir.path = main
+ incubator.test.dir.path = test
+ local.test.dir.path     = test
+ includes     = **
+ excludes     =
+ modules.list = org.apache.sis.cloud.aws,\
+                org.apache.sis.console,\
+                org.apache.sis.feature,\
+                org.apache.sis.gui,\
+                org.apache.sis.metadata,\
+                org.apache.sis.openoffice,\
+                org.apache.sis.portrayal,\
+                org.apache.sis.profile.france,\
+                org.apache.sis.profile.japan,\
+                org.apache.sis.referencing,\
+                org.apache.sis.referencing.gazetteer,\
+                org.apache.sis.storage,\
+                org.apache.sis.storage.earthobservation,\
+                org.apache.sis.storage.geotiff,\
+                org.apache.sis.storage.netcdf,\
+                org.apache.sis.storage.sql,\
+                org.apache.sis.storage.xml,\
+                org.apache.sis.util
+ read.options = --add-reads org.apache.sis.cloud.aws=junit \
+                --add-reads org.apache.sis.console=junit \
+                --add-reads org.apache.sis.feature=junit \
+                --add-reads org.apache.sis.metadata=junit \
+                --add-reads org.apache.sis.openoffice=junit \
+                --add-reads org.apache.sis.portrayal=junit \
+                --add-reads org.apache.sis.profile.france=junit \
+                --add-reads org.apache.sis.profile.japan=junit \
+                --add-reads org.apache.sis.referencing=junit \
+                --add-reads org.apache.sis.referencing.gazetteer=junit \
+                --add-reads org.apache.sis.storage=junit \
+                --add-reads org.apache.sis.storage.earthobservation=junit \
+                --add-reads org.apache.sis.storage.geotiff=junit \
+                --add-reads org.apache.sis.storage.netcdf=junit \
+                --add-reads org.apache.sis.storage.sql=junit \
+                --add-reads org.apache.sis.storage.xml=junit \
+                --add-reads org.apache.sis.util=junit
+ test.options = --add-modules jama,GeographicLib.Java,\
+                  com.h2database,\
+                  org.hsqldb,\
+                  org.apache.derby.tools,\
+                  software.amazon.awssdk.utils,\
+                  org.opengis.geoapi.conformance,\
+                  ${modules.list} \
+                --add-exports org.apache.sis.util/org.apache.sis.test=${modules.list} \
+                --add-exports org.apache.sis.metadata/org.apache.sis.test.xml=${modules.list} \
+                --add-exports org.apache.sis.metadata/org.apache.sis.test.sql=${modules.list} \
+                --add-exports org.apache.sis.metadata/org.apache.sis.test.mock=${modules.list} \
+                --add-exports org.apache.sis.metadata/org.apache.sis.metadata.xml=org.apache.sis.storage \
+                --add-exports org.apache.sis.metadata/org.apache.sis.internal.xml=org.apache.sis.storage.geotiff \
+                --add-exports org.apache.sis.metadata/org.apache.sis.internal.metadata=org.apache.sis.referencing.gazetteer \
+                --add-exports org.apache.sis.metadata/org.apache.sis.internal.jaxb.gcx=org.apache.sis.referencing \
+                --add-exports org.apache.sis.feature/org.apache.sis.internal.feature.jts=org.apache.sis.storage.sql,org.apache.sis.portrayal \
+                --add-exports org.apache.sis.storage/org.apache.sis.internal.storage=org.apache.sis.portrayal \
+                --add-exports org.apache.sis.storage/org.apache.sis.test.storage=${modules.list}
+ 
+ #
+ # Modulepaths for compilation, execution and tests.
+ # All dependencies except GeoAPI are downloaded by Ivy.
+ #
+ maven.repository = ${user.home}/.m2/repository
 -geoapi.version   = 3.1-SNAPSHOT
+ endorsed.classpath=
+ javac.classpath=
+ javac.modulepath=${javafx.module.path}:\
 -    ${maven.repository}/org/opengis/geoapi-pending/${geoapi.version}/geoapi-pending-${geoapi.version}.jar:\
 -    ${maven.repository}/org/opengis/geoapi-conformance/${geoapi.version}/geoapi-conformance-${geoapi.version}.jar:\
+     ${build.dir}/dependencies
+ javac.processorpath=
+ javac.processormodulepath=
+ javac.test.classpath=
+ javac.test.modulepath=\
+     ${build.modules.dir}:\
+     ${javac.modulepath}
+ run.classpath=
+ run.modulepath=\
+     ${build.modules.dir}:\
+     ${javac.modulepath}
+ run.test.classpath=
+ run.test.modulepath=\
+     ${build.test.modules.dir}:\
+     ${javac.test.modulepath}
+ debug.modulepath=\
+     ${run.modulepath}
+ debug.test.modulepath=\
+     ${run.test.modulepath}
+ 
+ #
+ # Build configuration and destination directories.
+ # The `compile.on.save` property must be `false` for enabling the use of "../build.xml" file.
+ #
+ compile.on.save                          = false
+ javac.deprecation                        = true
+ javac.external.vm                        = false
+ javadoc.windowtitle                      = Apache SIS
+ javadoc.encoding                         = ${source.encoding}
+ javadoc.html5                            = true
+ javadoc.author                           = false
+ javadoc.version                          = true
+ javadoc.use                              = true
+ javadoc.noindex                          = false
+ javadoc.nonavbar                         = false
+ javadoc.notree                           = false
+ javadoc.private                          = false
+ javadoc.splitindex                       = false
+ annotation.processing.enabled            = false
+ annotation.processing.enabled.in.editor  = false
+ annotation.processing.run.all.processors = true
+ annotation.processing.processors.list    =
+ annotation.processing.source.output      = ${build.generated.sources.dir}/ap-source-output
+ jlink.launcher                           = false
+ jlink.launcher.name                      = Apache_SIS
+ jar.compress                             = true
+ build.dir                                = build
+ build.classes.dir                        = ${build.dir}/classes
+ build.modules.dir                        = ${build.dir}/modules
+ build.generated.dir                      = ${build.dir}/generated
+ build.generated.sources.dir              = ${build.dir}/generated-sources
+ build.test.classes.dir                   = ${build.dir}/test/classes
+ build.test.modules.dir                   = ${build.dir}/test/modules
+ build.test.results.dir                   = ${build.dir}/test/results
+ build.classes.excludes                   = **/*
+ build.sysclasspath                       = ignore
+ dist.dir                                 = ${build.dir}/dist
+ dist.jar                                 = ${dist.dir}/SIS.jar
+ dist.jlink.dir                           = ${dist.dir}/jlink
+ dist.jlink.output                        = ${dist.jlink.dir}/SIS
+ dist.javadoc.dir                         = ${dist.dir}/javadoc
+ mkdist.disabled                          = true
diff --cc netbeans-project/nbproject/project.xml
index 0000000000,0e6287dc51..a3296f3b05
mode 000000,100644..100644
--- a/netbeans-project/nbproject/project.xml
+++ b/netbeans-project/nbproject/project.xml
@@@ -1,0 -1,32 +1,32 @@@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!--
+     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.
+ -->
+ <project xmlns="http://www.netbeans.org/ns/project/1">
+     <type>org.netbeans.modules.java.j2semodule</type>
+     <configuration>
+         <data xmlns="http://www.netbeans.org/ns/j2se-modular-project/1">
 -            <name>Apache SIS on GeoAPI 3.1</name>
++            <name>Apache SIS on GeoAPI 3.0</name>
+             <source-roots>
+                 <root id="src.dir" pathref="src.dir.path"/>
+                 <root id="optional.main.dir" pathref="optional.main.dir.path"/>
+                 <root id="incubator.main.dir" pathref="incubator.main.dir.path"/>
+             </source-roots>
+             <test-roots>
+                 <root id="test.src.dir" pathref="test.src.dir.path"/>
+                 <root id="optional.test.dir" pathref="optional.test.dir.path"/>
+                 <root id="incubator.test.dir" pathref="incubator.test.dir.path"/>
+                 <root id="local.test.dir" pathref="local.test.dir.path"/>
+             </test-roots>
+         </data>
+     </configuration>
+ </project>