[jira] [Resolved] (SIS-438) Make SIS compatible with latest Java versions
[
https://issues.apache.org/jira/browse/SIS-438?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Martin Desruisseaux resolved SIS-438.
-
Resolution: Fixed
> Make SIS compatible with latest Java versions
> -
>
> Key: SIS-438
> URL: https://issues.apache.org/jira/browse/SIS-438
> Project: Spatial Information Systems
> Issue Type: Task
> Components: Utilities
>Reporter: Martin Desruisseaux
>Assignee: Martin Desruisseaux
>Priority: Blocker
> Fix For: 1.0
>
>
> Apache SIS make two assumptions which are not valid anymore since Java 9:
> * It assumes that JavaDB is available in the Java installation directory.
> Note that this is not true anymore even in Java 8 since latest updates (e.g.
> 1.8.0_191).
> * It assumes that JAXB is on the classpath. This is not true anymore since
> Java 9.
> Actions to take:
> * We should remove the search for JavaDB in
> {{org.apache.sis.internal.metadata.sql.Initializer.forJavaDB}} lines 511 to
> 525.
> * We need to make above method tolerant to {{ClassNotFoundException}}.
> * We should add Derby dependency with runtime scope in {{sis-console}}.
> * We need to add JAXB-API dependency in a Java 11 profile of root {{pom.xml}}
> file.
> In addition of making sure that JUnit tests pass, we also need to test
> {{sis-console}} command-line application and {{sis-openoffice}} add-in.
--
This message was sent by Atlassian Jira
(v8.3.2#803003)
[sis] branch master updated (cd5fecb -> bd04498)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/sis.git. from cd5fecb Merge branch 'geoapi-3.1' add 8b31096 chore(Build): set explicit dependencies for JAXB api and engine. add 2972cce fix(referencing): remove useless jaxb dependency, already handled by sis-metadata. add b9b440d Merge branch 'chore/jaxb-dependency' into geoapi-4.0 with modifications: - Implementation.INTERNAL keep for now with removal is deferred at a later time: https://issues.apache.org/jira/browse/SIS-469 - All OGCNamespacePrefixMapper removed instead of only one, in order to keep Implementation.INTERNAL and ENDORSED equivalent. - Jakarata dependency with provided scope for allowing Java 8 to use its internal JAXB implementation. add 1f6356a Add a note about JAXB being distributed under Eclipse Distribution License license. add 17e09ca Make the sis-javafx module optional. That module is built only if the PATH_TO_FX environment variable is set. See https://openjfx.io/openjfx-docs/#install-javafx for more information. add 599ef94 Remove spurious warnings about "org.apache.sis.xml.defaultNamespace" property. add 2114e9d Modify the NetBeans project configuration for making it compatible with Java 11. We dropped the JavaFX sources from now (they are still present as an optional Maven module). add ae989c9 Add a note saying that Apache SIS can be built with Java version higher than 10. https://issues.apache.org/jira/browse/SIS-438 add 3363d3c Merge branch 'geoapi-4.0' into geoapi-3.1: make Apache SIS compatible with Java 11+. https://issues.apache.org/jira/browse/SIS-438 new bd04498 Merge branch 'geoapi-3.1'. Make Apache SIS compatible with Java 11. https://issues.apache.org/jira/browse/SIS-438 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: NOTICE | 11 +- application/pom.xml| 17 ++- application/sis-console/pom.xml| 5 + application/sis-javafx/pom.xml | 5 +- .../org/apache/sis/internal/gui/Resources.java | 2 +- core/sis-metadata/pom.xml | 13 +- .../apache/sis/internal/jaxb/gco/package-info.java | 5 +- .../java/org/apache/sis/xml/Implementation.java| 32 ++--- .../java/org/apache/sis/xml/MarshallerPool.java| 25 +--- .../apache/sis/xml/OGCNamespacePrefixMapper.java | 79 .../sis/xml/OGCNamespacePrefixMapper_Endorsed.java | 73 --- .../src/main/java/org/apache/sis/xml/XML.java | 7 +- .../apache/sis/test/suite/MetadataTestSuite.java | 1 - .../org/apache/sis/xml/MarshallerPoolTest.java | 2 - .../sis/xml/OGCNamespacePrefixMapperTest.java | 134 - core/sis-referencing/pom.xml | 9 ++ ide-project/NetBeans/nbproject/build-impl.xml | 47 +++- ide-project/NetBeans/nbproject/genfiles.properties | 4 +- ide-project/NetBeans/nbproject/project.properties | 43 --- ide-project/NetBeans/nbproject/project.xml | 2 - pom.xml| 24 +++- profiles/sis-french-profile/pom.xml| 5 + storage/sis-storage/pom.xml| 5 + storage/sis-xmlstore/pom.xml | 5 + 24 files changed, 137 insertions(+), 418 deletions(-) delete mode 100644 core/sis-metadata/src/main/java/org/apache/sis/xml/OGCNamespacePrefixMapper.java delete mode 100644 core/sis-metadata/src/main/java/org/apache/sis/xml/OGCNamespacePrefixMapper_Endorsed.java delete mode 100644 core/sis-metadata/src/test/java/org/apache/sis/xml/OGCNamespacePrefixMapperTest.java
[sis] 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1: make Apache SIS compatible with Java 11+. https://issues.apache.org/jira/browse/SIS-438
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-3.1
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 3363d3ce6469f952fab2850dc4c813093789982c
Merge: 83846c5 ae989c9
Author: Martin Desruisseaux
AuthorDate: Mon Sep 2 15:41:23 2019 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1: make Apache SIS compatible with
Java 11+.
https://issues.apache.org/jira/browse/SIS-438
NOTICE | 11 +-
application/pom.xml| 17 ++-
application/sis-console/pom.xml| 5 +
application/sis-javafx/pom.xml | 5 +-
.../org/apache/sis/internal/gui/Resources.java | 2 +-
core/sis-metadata/pom.xml | 13 +-
.../apache/sis/internal/jaxb/gco/package-info.java | 5 +-
.../java/org/apache/sis/xml/Implementation.java| 32 ++---
.../java/org/apache/sis/xml/MarshallerPool.java| 25 +---
.../apache/sis/xml/OGCNamespacePrefixMapper.java | 79
.../sis/xml/OGCNamespacePrefixMapper_Endorsed.java | 73 ---
.../src/main/java/org/apache/sis/xml/XML.java | 7 +-
.../apache/sis/test/suite/MetadataTestSuite.java | 1 -
.../org/apache/sis/xml/MarshallerPoolTest.java | 2 -
.../sis/xml/OGCNamespacePrefixMapperTest.java | 134 -
core/sis-referencing/pom.xml | 9 ++
ide-project/NetBeans/nbproject/build-impl.xml | 47 +++-
ide-project/NetBeans/nbproject/genfiles.properties | 4 +-
ide-project/NetBeans/nbproject/project.properties | 43 ---
ide-project/NetBeans/nbproject/project.xml | 2 -
pom.xml| 24 +++-
profiles/sis-french-profile/pom.xml| 5 +
storage/sis-storage/pom.xml| 5 +
storage/sis-xmlstore/pom.xml | 5 +
24 files changed, 137 insertions(+), 418 deletions(-)
diff --cc ide-project/NetBeans/nbproject/genfiles.properties
index 56a977b,33afce4..2039f39
--- a/ide-project/NetBeans/nbproject/genfiles.properties
+++ b/ide-project/NetBeans/nbproject/genfiles.properties
@@@ -3,6 -3,6 +3,6 @@@
build.xml.data.CRC32=58e6b21c
build.xml.script.CRC32=462eaba0
build.xml.stylesheet.CRC32=28e38971@1.53.1.46
- nbproject/build-impl.xml.data.CRC32=5a726ec7
- nbproject/build-impl.xml.script.CRC32=f4ace637
-nbproject/build-impl.xml.data.CRC32=aba75efd
-nbproject/build-impl.xml.script.CRC32=9e0e11c0
++nbproject/build-impl.xml.data.CRC32=c66331aa
++nbproject/build-impl.xml.script.CRC32=a8b9b922
nbproject/build-impl.xml.stylesheet.CRC32=3a2fa800@1.92.0.48
diff --cc ide-project/NetBeans/nbproject/project.properties
index 5c0589c,bf11345..3c762ce
--- a/ide-project/NetBeans/nbproject/project.properties
+++ b/ide-project/NetBeans/nbproject/project.properties
@@@ -98,8 -103,10 +96,11 @@@ test.jpn-profile.dir = ${project.root}/
# Those dependencies must exist in the local Maven repository.
# Those numbers should match the ones declared in the pom.xml files.
#
+geoapi.version = 3.1-SNAPSHOT
jsr363.version = 1.0
+ jaxb.version = 2.3.2
+ istack.version = 3.0.8
+ activation.version = 1.1
jama.version = 1.0.3
geographlib.version = 1.49
guava.version= 27.0.1-jre
@@@ -132,8 -138,9 +132,9 @@@ icons.version= 3.0.
maven.repository = ${user.home}/.m2/repository
endorsed.classpath =
javac.classpath=\
-${project.GeoAPI}/dist/geoapi.jar:\
+
${maven.repository}/org/opengis/geoapi-pending/${geoapi.version}/geoapi-pending-${geoapi.version}.jar:\
${maven.repository}/javax/measure/unit-api/${jsr363.version}/unit-api-${jsr363.version}.jar:\
+
${maven.repository}/jakarta/xml/bind/jakarta.xml.bind-api/${jaxb.version}/jakarta.xml.bind-api-${jaxb.version}.jar:\
${maven.repository}/com/esri/geometry/esri-geometry-api/${esri.api.version}/esri-geometry-api-${esri.api.version}.jar:\
${maven.repository}/org/locationtech/jts/jts-core/${jts.version}/jts-core-${jts.version}.jar:\
${maven.repository}/org/geonames/georss-rome/${georss.version}/georss-rome-${georss.version}.jar:\
diff --cc pom.xml
index 35eb654,c793b97..16aae5e
--- a/pom.xml
+++ b/pom.xml
@@@ -547,7 -565,8 +565,8 @@@
8
${project.version}
1.0-M1
-4.0-SNAPSHOT
+3.1-SNAPSHOT
+ 2.3.2
[sis] 01/01: Merge branch 'geoapi-3.1'. Make Apache SIS compatible with Java 11. https://issues.apache.org/jira/browse/SIS-438
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sis.git
commit bd04498c959144f13fd269795b3101f9821fcae8
Merge: cd5fecb 3363d3c
Author: Martin Desruisseaux
AuthorDate: Mon Sep 2 15:49:38 2019 +0200
Merge branch 'geoapi-3.1'. Make Apache SIS compatible with Java 11.
https://issues.apache.org/jira/browse/SIS-438
NOTICE | 11 +-
application/pom.xml| 17 ++-
application/sis-console/pom.xml| 5 +
application/sis-javafx/pom.xml | 5 +-
.../org/apache/sis/internal/gui/Resources.java | 2 +-
core/sis-metadata/pom.xml | 13 +-
.../apache/sis/internal/jaxb/gco/package-info.java | 5 +-
.../java/org/apache/sis/xml/Implementation.java| 32 ++---
.../java/org/apache/sis/xml/MarshallerPool.java| 25 +---
.../apache/sis/xml/OGCNamespacePrefixMapper.java | 79
.../sis/xml/OGCNamespacePrefixMapper_Endorsed.java | 73 ---
.../src/main/java/org/apache/sis/xml/XML.java | 7 +-
.../apache/sis/test/suite/MetadataTestSuite.java | 1 -
.../org/apache/sis/xml/MarshallerPoolTest.java | 2 -
.../sis/xml/OGCNamespacePrefixMapperTest.java | 134 -
core/sis-referencing/pom.xml | 9 ++
ide-project/NetBeans/nbproject/build-impl.xml | 47 +++-
ide-project/NetBeans/nbproject/genfiles.properties | 4 +-
ide-project/NetBeans/nbproject/project.properties | 43 ---
ide-project/NetBeans/nbproject/project.xml | 2 -
pom.xml| 24 +++-
profiles/sis-french-profile/pom.xml| 5 +
storage/sis-storage/pom.xml| 5 +
storage/sis-xmlstore/pom.xml | 5 +
24 files changed, 137 insertions(+), 418 deletions(-)
diff --cc ide-project/NetBeans/nbproject/genfiles.properties
index 5d88045,2039f39..3f5e676
--- a/ide-project/NetBeans/nbproject/genfiles.properties
+++ b/ide-project/NetBeans/nbproject/genfiles.properties
@@@ -3,6 -3,6 +3,6 @@@
build.xml.data.CRC32=58e6b21c
build.xml.script.CRC32=462eaba0
build.xml.stylesheet.CRC32=28e38971@1.53.1.46
- nbproject/build-impl.xml.data.CRC32=1e9c8996
- nbproject/build-impl.xml.script.CRC32=1aba96b2
-nbproject/build-impl.xml.data.CRC32=c66331aa
-nbproject/build-impl.xml.script.CRC32=a8b9b922
++nbproject/build-impl.xml.data.CRC32=82e7f46a
++nbproject/build-impl.xml.script.CRC32=dbe1a9a7
nbproject/build-impl.xml.stylesheet.CRC32=3a2fa800@1.92.0.48
diff --cc ide-project/NetBeans/nbproject/project.properties
index 5491b32,3c762ce..a91ab13
--- a/ide-project/NetBeans/nbproject/project.properties
+++ b/ide-project/NetBeans/nbproject/project.properties
@@@ -98,8 -96,11 +96,11 @@@ test.jpn-profile.dir = ${project.root}/
# Those dependencies must exist in the local Maven repository.
# Those numbers should match the ones declared in the pom.xml files.
#
-geoapi.version = 3.1-SNAPSHOT
+geoapi.version = 3.0.1
jsr363.version = 1.0
+ jaxb.version = 2.3.2
+ istack.version = 3.0.8
+ activation.version = 1.1
jama.version = 1.0.3
geographlib.version = 1.49
guava.version= 27.0.1-jre
@@@ -132,8 -132,9 +132,9 @@@ icons.version= 3.0.
maven.repository = ${user.home}/.m2/repository
endorsed.classpath =
javac.classpath=\
-
${maven.repository}/org/opengis/geoapi-pending/${geoapi.version}/geoapi-pending-${geoapi.version}.jar:\
+
${maven.repository}/org/opengis/geoapi/${geoapi.version}/geoapi-${geoapi.version}.jar:\
${maven.repository}/javax/measure/unit-api/${jsr363.version}/unit-api-${jsr363.version}.jar:\
+
${maven.repository}/jakarta/xml/bind/jakarta.xml.bind-api/${jaxb.version}/jakarta.xml.bind-api-${jaxb.version}.jar:\
${maven.repository}/com/esri/geometry/esri-geometry-api/${esri.api.version}/esri-geometry-api-${esri.api.version}.jar:\
${maven.repository}/org/locationtech/jts/jts-core/${jts.version}/jts-core-${jts.version}.jar:\
${maven.repository}/org/geonames/georss-rome/${georss.version}/georss-rome-${georss.version}.jar:\
diff --cc pom.xml
index d2f5ae1,16aae5e..226f294
--- a/pom.xml
+++ b/pom.xml
@@@ -547,7 -565,8 +565,8 @@@
8
${project.version}
1.0-M1
-3.1-SNAPSHOT
+3.0.1
+ 2.3.2
[sis] branch geoapi-3.1 updated (83846c5 -> 3363d3c)
This is an automated email from the ASF dual-hosted git repository. desruisseaux pushed a change to branch geoapi-3.1 in repository https://gitbox.apache.org/repos/asf/sis.git. from 83846c5 Merge branch 'geoapi-4.0' into geoapi-3.1 add 8b31096 chore(Build): set explicit dependencies for JAXB api and engine. add 2972cce fix(referencing): remove useless jaxb dependency, already handled by sis-metadata. add b9b440d Merge branch 'chore/jaxb-dependency' into geoapi-4.0 with modifications: - Implementation.INTERNAL keep for now with removal is deferred at a later time: https://issues.apache.org/jira/browse/SIS-469 - All OGCNamespacePrefixMapper removed instead of only one, in order to keep Implementation.INTERNAL and ENDORSED equivalent. - Jakarata dependency with provided scope for allowing Java 8 to use its internal JAXB implementation. add 1f6356a Add a note about JAXB being distributed under Eclipse Distribution License license. add 17e09ca Make the sis-javafx module optional. That module is built only if the PATH_TO_FX environment variable is set. See https://openjfx.io/openjfx-docs/#install-javafx for more information. add 599ef94 Remove spurious warnings about "org.apache.sis.xml.defaultNamespace" property. add 2114e9d Modify the NetBeans project configuration for making it compatible with Java 11. We dropped the JavaFX sources from now (they are still present as an optional Maven module). add ae989c9 Add a note saying that Apache SIS can be built with Java version higher than 10. https://issues.apache.org/jira/browse/SIS-438 new 3363d3c Merge branch 'geoapi-4.0' into geoapi-3.1: make Apache SIS compatible with Java 11+. https://issues.apache.org/jira/browse/SIS-438 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: NOTICE | 11 +- application/pom.xml| 17 ++- application/sis-console/pom.xml| 5 + application/sis-javafx/pom.xml | 5 +- .../org/apache/sis/internal/gui/Resources.java | 2 +- core/sis-metadata/pom.xml | 13 +- .../apache/sis/internal/jaxb/gco/package-info.java | 5 +- .../java/org/apache/sis/xml/Implementation.java| 32 ++--- .../java/org/apache/sis/xml/MarshallerPool.java| 25 +--- .../apache/sis/xml/OGCNamespacePrefixMapper.java | 79 .../sis/xml/OGCNamespacePrefixMapper_Endorsed.java | 73 --- .../src/main/java/org/apache/sis/xml/XML.java | 7 +- .../apache/sis/test/suite/MetadataTestSuite.java | 1 - .../org/apache/sis/xml/MarshallerPoolTest.java | 2 - .../sis/xml/OGCNamespacePrefixMapperTest.java | 134 - core/sis-referencing/pom.xml | 9 ++ ide-project/NetBeans/nbproject/build-impl.xml | 47 +++- ide-project/NetBeans/nbproject/genfiles.properties | 4 +- ide-project/NetBeans/nbproject/project.properties | 43 --- ide-project/NetBeans/nbproject/project.xml | 2 - pom.xml| 24 +++- profiles/sis-french-profile/pom.xml| 5 + storage/sis-storage/pom.xml| 5 + storage/sis-xmlstore/pom.xml | 5 + 24 files changed, 137 insertions(+), 418 deletions(-) delete mode 100644 core/sis-metadata/src/main/java/org/apache/sis/xml/OGCNamespacePrefixMapper.java delete mode 100644 core/sis-metadata/src/main/java/org/apache/sis/xml/OGCNamespacePrefixMapper_Endorsed.java delete mode 100644 core/sis-metadata/src/test/java/org/apache/sis/xml/OGCNamespacePrefixMapperTest.java
svn commit: r1049523 - in /websites/staging/sis/trunk/content: ./ downloads.html index.html
Author: buildbot Date: Mon Sep 2 13:22:20 2019 New Revision: 1049523 Log: Staging update by buildbot for sis Modified: websites/staging/sis/trunk/content/ (props changed) websites/staging/sis/trunk/content/downloads.html websites/staging/sis/trunk/content/index.html Propchange: websites/staging/sis/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Mon Sep 2 13:22:20 2019 @@ -1 +1 @@ -1866222 +1866279 Modified: websites/staging/sis/trunk/content/downloads.html == --- websites/staging/sis/trunk/content/downloads.html (original) +++ websites/staging/sis/trunk/content/downloads.html Mon Sep 2 13:22:20 2019 @@ -151,7 +151,8 @@ pgpv apache-sis-X.Y.Z.zip.asc Download as a Maven dependency An easy approach to integrate Apache SIS into a Java project uses the http://maven.apache.org/;>Apache Maven dependency management tool to automatically obtain the required Java Archives (JAR) files from the network. -Below are examples of declarations in a pom.xml file for building a project with the SIS core module: +Below are examples of declarations in a pom.xml file for building a project with a SIS core module. +If running on Java 11 or higher, one of the two next dependencies is also required: properties sis.version0.8/sis.version /properties Modified: websites/staging/sis/trunk/content/index.html == --- websites/staging/sis/trunk/content/index.html (original) +++ websites/staging/sis/trunk/content/index.html Mon Sep 2 13:22:20 2019 @@ -136,9 +136,10 @@ The SIS storage modules provide a common Using Apache SIS The latest SIS release is 0.8, released November 2017. -Apache SIS requires Java 8 or higher together with JAXB. +Apache SIS requires Java 10 or higher for building, but can be executed on Java 8 or higher. If using Java 8 Runtime Environment, nothing else is needed since Java 8 includes JAXB. -If using Java 9 or higher, one of the following configurations is needed: +If using Java 9 or higher, one of the following configurations is needed +(those extra configurations are temporary until support for Java 8 will be dropped in a future SIS version): "--add-modules java.xml.bind,java.xml.ws.annotation" option (available with Java 9 or 10 only) added to the java command or JAXB dependency added from Glassfish or Jakarata projects. See Maven coordinates.
svn commit: r1866279 - in /sis/site/trunk/content: downloads.mdtext index.mdtext
Author: desruisseaux
Date: Mon Sep 2 13:22:09 2019
New Revision: 1866279
URL: http://svn.apache.org/viewvc?rev=1866279=rev
Log:
Update information about required Java versions.
Modified:
sis/site/trunk/content/downloads.mdtext
sis/site/trunk/content/index.mdtext
Modified: sis/site/trunk/content/downloads.mdtext
URL:
http://svn.apache.org/viewvc/sis/site/trunk/content/downloads.mdtext?rev=1866279=1866278=1866279=diff
==
--- sis/site/trunk/content/downloads.mdtext [UTF-8] (original)
+++ sis/site/trunk/content/downloads.mdtext [UTF-8] Mon Sep 2 13:22:09 2019
@@ -76,7 +76,8 @@ Download as a Maven dependency{#mave
An easy approach to integrate Apache SIS into a Java project uses the [Apache
Maven][maven]
dependency management tool to automatically obtain the required Java Archives
(JAR) files from the network.
-Below are examples of declarations in a `pom.xml` file for building a project
with the SIS core module:
+Below are examples of declarations in a `pom.xml` file for building a project
with a SIS core module.
+If running on Java 11 or higher, _one_ of the two next dependencies is also
required:
:::xml
Modified: sis/site/trunk/content/index.mdtext
URL:
http://svn.apache.org/viewvc/sis/site/trunk/content/index.mdtext?rev=1866279=1866278=1866279=diff
==
--- sis/site/trunk/content/index.mdtext [UTF-8] (original)
+++ sis/site/trunk/content/index.mdtext [UTF-8] Mon Sep 2 13:22:09 2019
@@ -51,9 +51,10 @@ Some Apache SIS features are:
Using Apache SIS{#user}
---
The latest SIS release is 0.8, released November 2017.
-Apache SIS requires Java 8 or higher together with JAXB.
+Apache SIS requires Java 10 or higher for building, but can be executed on
Java 8 or higher.
If using Java 8 Runtime Environment, nothing else is needed since Java 8
includes JAXB.
-If using Java 9 or higher, one of the following configurations is needed:
+If using Java 9 or higher, one of the following configurations is needed
+(those extra configurations are temporary until support for Java 8 will be
dropped in a future SIS version):
* "`--add-modules java.xml.bind,java.xml.ws.annotation`" option (available
with Java 9 or 10 only) added to the `java` command
* or JAXB dependency added from Glassfish or Jakarata projects. See [Maven
coordinates](downloads.html#maven).
[sis] 01/05: Add a note about JAXB being distributed under Eclipse Distribution License license.
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 1f6356a0519d49bd2e999edf2400b0ab09209e9b Author: Martin Desruisseaux AuthorDate: Mon Sep 2 11:10:41 2019 +0200 Add a note about JAXB being distributed under Eclipse Distribution License license. --- NOTICE | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/NOTICE b/NOTICE index 6377d6c..e7b7f67 100644 --- a/NOTICE +++ b/NOTICE @@ -14,15 +14,18 @@ http://www.opengeospatial.org/ogc/software Apache SIS depends on JSR-363 (API only) published under BSD license. https://www.jcp.org/aboutJava/communityprocess/final/jsr363/index.html -The 'org.apache.sis.referencing.operation.matrix' package contains code +Apache SIS depends on JAXB (API only) published under Eclipse Distribution License license. +http://www.eclipse.org/org/documents/edl-v10.php + +The `org.apache.sis.referencing.operation.matrix` package contains code adapted from JAMA Java Matrix Package in public domain. http://math.nist.gov/javanumerics/jama/ -The 'sis-feature' module can optionally use the Esri Geometry API +The `sis-feature` module can optionally use the Esri Geometry API developed by ESRI under Apache license 2. http://github.com/Esri/geometry-api-java/ -The 'sis-netcdf' module can optionally use the UCAR netCDF library +The `sis-netcdf` module can optionally use the UCAR netCDF library developed by Unidata under MIT-style license. http://www.unidata.ucar.edu/software/thredds/current/netcdf-java/ @@ -30,6 +33,6 @@ The test suite uses software developed by the JUnit community under Eclipse public license version 2. http://junit.org/junit4/ -The 'non-free' group of modules contain geodetic data collected +The `non-free` group of modules contain geodetic data collected by the International Association of Oil and Gas Producers. http://www.epsg.org/TermsOfUse.aspx
[sis] 05/05: Add a note saying that Apache SIS can be built with Java version higher than 10. https://issues.apache.org/jira/browse/SIS-438
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 ae989c9f8b38c8f37dbc22754a9f7e823131e588 Author: Martin Desruisseaux AuthorDate: Mon Sep 2 15:18:50 2019 +0200 Add a note saying that Apache SIS can be built with Java version higher than 10. https://issues.apache.org/jira/browse/SIS-438 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 951a6560..c793b97 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ Maven 2 project configuration file http://maven.apache.org/maven2/ - Apache SIS build requires Java 10, but compilation result can be executed on Java 8. + Apache SIS build requires Java 10 or higher, but compiled files can be executed on Java 8. Setting the SIS_DATA environment variable before build is optional but recommended. Build development snapshot:mvn clean install
[sis] 04/05: Modify the NetBeans project configuration for making it compatible with Java 11. We dropped the JavaFX sources from now (they are still present as an optional Maven module).
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 2114e9df0326ecc65e916cbde6192d9d67775cc1 Author: Martin Desruisseaux AuthorDate: Mon Sep 2 15:10:32 2019 +0200 Modify the NetBeans project configuration for making it compatible with Java 11. We dropped the JavaFX sources from now (they are still present as an optional Maven module). --- ide-project/NetBeans/nbproject/build-impl.xml | 47 +++--- ide-project/NetBeans/nbproject/genfiles.properties | 6 +-- ide-project/NetBeans/nbproject/project.properties | 39 +- ide-project/NetBeans/nbproject/project.xml | 2 - 4 files changed, 37 insertions(+), 57 deletions(-) diff --git a/ide-project/NetBeans/nbproject/build-impl.xml b/ide-project/NetBeans/nbproject/build-impl.xml index 5d6cd1d..1911383 100644 --- a/ide-project/NetBeans/nbproject/build-impl.xml +++ b/ide-project/NetBeans/nbproject/build-impl.xml @@ -90,7 +90,7 @@ is divided into following sections: - + @@ -193,7 +193,6 @@ is divided into following sections: - @@ -217,7 +216,6 @@ is divided into following sections: - @@ -340,7 +338,6 @@ is divided into following sections: Must set src.local-src.dir Must set src.webapp.dir -Must set src.javafx.dir Must set src.console.dir Must set src.portrayal.dir Must set src.earth-obs.dir @@ -360,7 +357,6 @@ is divided into following sections: Must set src.gdal.dir Must set src.c.gdal.dir Must set test.webapp.dir -Must set test.javafx.dir Must set test.console.dir Must set test.portrayal.dir Must set test.earth-obs.dir @@ -398,7 +394,7 @@ is divided into following sections: http://www.netbeans.org/ns/j2se-project/3;> - + @@ -410,7 +406,7 @@ is divided into following sections: - + @@ -465,7 +461,7 @@ is divided into following sections: http://www.netbeans.org/ns/j2se-project/3;> - + @@ -508,7 +504,7 @@ is divided into following sections: http://www.netbeans.org/ns/j2se-project/3;> - + @@ -543,7 +539,7 @@ is divided into following sections: http://www.netbeans.org/ns/j2se-project/3;> - + @@ -679,9 +675,6 @@ is divided into following sections: - - - @@ -759,9 +752,6 @@ is divided into following sections: - - - @@ -1295,14 +1285,13 @@ is divided into following sections: - + - @@ -1341,7 +1330,7 @@ is divided into following sections: Must select some files in the IDE or set javac.includes - @@ -1725,9 +1714,6 @@ is divided into following sections: - - - @@ -1796,9 +1782,6 @@ is divided into following sections: - - - @@ -1875,14 +1858,14 @@ is divided into following sections: - - + + - @@ -1923,17 +1906,16 @@ is divided into following sections: - - - @@ -1965,14 +1947,13 @@ is divided into following sections: Must select some files in the
[sis] 02/05: Make the sis-javafx module optional. That module is built only if the PATH_TO_FX environment variable is set. See https://openjfx.io/openjfx-docs/#install-javafx for more information.
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 17e09ca2f91f0c83aa52feb4976c314674bb8ddb
Author: Martin Desruisseaux
AuthorDate: Mon Sep 2 12:27:47 2019 +0200
Make the sis-javafx module optional. That module is built only if the
PATH_TO_FX environment variable is set.
See https://openjfx.io/openjfx-docs/#install-javafx for more information.
---
application/pom.xml | 17 +++--
application/sis-javafx/pom.xml | 5 -
.../java/org/apache/sis/internal/gui/Resources.java | 2 +-
3 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/application/pom.xml b/application/pom.xml
index 66f8f0c..a6ef1c1 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -112,12 +112,25 @@
sis-console
-sis-javafx
sis-webapp
sis-openoffice
+
+
+
+
+ env.PATH_TO_FX
+
+
+
+sis-javafx
+
+
+
diff --git a/application/sis-javafx/pom.xml b/application/sis-javafx/pom.xml
index 054ad0d..20d5ac0 100644
--- a/application/sis-javafx/pom.xml
+++ b/application/sis-javafx/pom.xml
@@ -40,6 +40,8 @@
Apache SIS application for JavaFX
Client application for JavaFX.
+This module require the JavaFX environment to be pre-installed.
+See https://openjfx.io/openjfx-docs/#install-javafx for details.
@@ -72,7 +74,8 @@
9
---add-modules
java.xml.bind,java.xml.ws.annotation,javafx.graphics
+--module-path ${env.PATH_TO_FX}
+--add-modules
javafx.graphics,javafx.controls,javafx.fxml,javafx.swing
diff --git
a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/Resources.java
b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/Resources.java
index 42b165c..678d1d9 100644
---
a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/Resources.java
+++
b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/Resources.java
@@ -18,7 +18,7 @@ package org.apache.sis.internal.gui;
import java.net.URL;
import java.util.MissingResourceException;
-import javax.annotation.Generated;
+import javax.annotation.processing.Generated;
import org.apache.sis.util.resources.KeyConstants;
import org.apache.sis.util.resources.IndexedResourceBundle;
[sis] 03/05: Remove spurious warnings about "org.apache.sis.xml.defaultNamespace" property.
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 599ef94e2a0026616f1d1dfd622fb04fbb2f1d5f
Author: Martin Desruisseaux
AuthorDate: Mon Sep 2 12:37:35 2019 +0200
Remove spurious warnings about "org.apache.sis.xml.defaultNamespace"
property.
---
core/sis-metadata/src/main/java/org/apache/sis/xml/MarshallerPool.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/core/sis-metadata/src/main/java/org/apache/sis/xml/MarshallerPool.java
b/core/sis-metadata/src/main/java/org/apache/sis/xml/MarshallerPool.java
index cb025b1..b40c1c2 100644
--- a/core/sis-metadata/src/main/java/org/apache/sis/xml/MarshallerPool.java
+++ b/core/sis-metadata/src/main/java/org/apache/sis/xml/MarshallerPool.java
@@ -188,7 +188,7 @@ public class MarshallerPool {
* properties which are handled especially by this constructor.
*/
template = new PooledTemplate(properties, implementation);
-final Object rootNamespace = template.remove(XML.DEFAULT_NAMESPACE,
"");
+final Object rootNamespace = template.remove(XML.DEFAULT_NAMESPACE,
null);
if (rootNamespace != null) {
Logging.getLogger(Loggers.XML).warning(XML.DEFAULT_NAMESPACE + "
property is no longer supported.");
}
