This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 21add5df507b7791990a3a1683118e5547810e6b
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Tue Dec 27 14:24:24 2022 +0100
Set the build requirement to Java 18, but the compilation target stay Java
11.
The intent is to replace our custom @preformat javadoc tag by the @snippet
tag,
which is new in Java 18.
---
README | 4 ++--
application/sis-javafx/doc/readme.txt | 2 --
.../src/main/java/org/apache/sis/measure/UnitServices.java | 2 +-
ide-project/NetBeans/nbproject/project.properties | 4 ++--
pom.xml | 6 +++---
5 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/README b/README
index 6d6ccb228f..309a01c880 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ Welcome to Apache SIS <https://sis.apache.org>
==============================================
SIS is a Java language library for developing geospatial applications.
-The library is an implementation of GeoAPI 3.0.1 interfaces and can be used
+The library is an implementation of GeoAPI 3.0.2 interfaces and can be used
for desktop or server applications. Apache SIS provides data structures for
geographic features and associated metadata along with methods to manipulate
those data structures. The SIS metadata module forms the base of the library
@@ -26,7 +26,7 @@ Getting Started
Running the library part of Apache SIS requires Java 11 or higher.
Running the JavaFX application part requires Java 16 or higher.
-Building SIS requires Java 17 or higher
+Building SIS requires Java 18 or higher
together with Maven 3 <https://maven.apache.org/> build system.
To build SIS, use the following command in this directory:
diff --git a/application/sis-javafx/doc/readme.txt
b/application/sis-javafx/doc/readme.txt
index ba6acfbc71..d6afa19a94 100644
--- a/application/sis-javafx/doc/readme.txt
+++ b/application/sis-javafx/doc/readme.txt
@@ -12,8 +12,6 @@ NetBeans Ant project, open the following file:
And add the following lines:
- javac.source = 17
- javac.target = 17
javac.modulepath = /path/to/my/install/javafx-sdk/lib
javafx.options = --add-modules javafx.graphics,javafx.controls,javafx.web
src.javafx.dir = ${project.root}/application/sis-javafx/src/main/java
diff --git
a/core/sis-utility/src/main/java/org/apache/sis/measure/UnitServices.java
b/core/sis-utility/src/main/java/org/apache/sis/measure/UnitServices.java
index 86a65df55a..93622e2134 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/measure/UnitServices.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/measure/UnitServices.java
@@ -211,7 +211,7 @@ public class UnitServices extends ServiceProvider
implements SystemOfUnitsServic
/**
* Returns a quantity format for the default locale.
*
- * @return a {@link tech.uom.seshat.QuantityFormat} instance for
quantities.
+ * @return a {@link org.apache.sis.measure.QuantityFormat} instance for
quantities.
* @since 1.4
*/
@Override
diff --git a/ide-project/NetBeans/nbproject/project.properties
b/ide-project/NetBeans/nbproject/project.properties
index 7a129754dd..d68acf9ea8 100644
--- a/ide-project/NetBeans/nbproject/project.properties
+++ b/ide-project/NetBeans/nbproject/project.properties
@@ -37,8 +37,8 @@ project.license = apache20
project.licensePath = ../LicenseHeader.txt
no.dependencies = true
source.encoding = UTF-8
-javac.source = 11
-javac.target = 11
+javac.source = 18
+javac.target = 18
platform.active = default_platform
junit.forkmode = once
run.jvmargs = -enableassertions ${javafx.options} \
diff --git a/pom.xml b/pom.xml
index 1d1a67e75c..48a80bf84c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
Maven project configuration file
http://maven.apache.org/
- Apache SIS build requires Java 17 or higher, but compiled files can be
executed on Java 11.
+ Apache SIS build requires Java 18 or higher, but compiled files can be
executed on Java 11.
Setting the SIS_DATA environment variable before build is optional but
recommended.
Build development snapshot: mvn clean install
@@ -58,7 +58,7 @@
<description>
Apache Spatial Information System (SIS) is a free software, Java language
library for developing geospatial applications.
SIS provides data structures for geographic features and associated
metadata along with methods to manipulate those data structures.
- The library is an implementation of GeoAPI 3.0.1 interfaces and can be
used for desktop or server applications.
+ The library is an implementation of GeoAPI 3.0.2 interfaces and can be
used for desktop or server applications.
The SIS metadata module forms the base of the library and enables the
creation of metadata objects which comply with the ISO 19115 international
standard.
The SIS referencing module enable the construction of geodetic data
structures for geospatial referencing as defined by ISO 19111 standard,
along with the associated operations which enable the transformation of
coordinates between different reference systems.
@@ -625,7 +625,7 @@
<configuration>
<rules>
<requireJavaVersion>
- <version>17</version>
+ <version>18</version>
</requireJavaVersion>
</rules>
</configuration>
