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 2021/09/29 16:59:36 UTC
[sis] branch geoapi-4.0 updated (c18ff54 -> 5703473)
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git.
from c18ff54 Update the EPSG data URL to the next version to be published.
new 0608136 Update the "non-free" dependency to the next version to be published.
new a2e60c4 Edit README files.
new 0d572ec Increment the version number of classes that have been excluded from SIS 1.1 release. We use this information as a note that the class can be changed during 1.2 development.
new 5703473 Move an internal class for avoiding to have a `org.apache.sis.internal.simple` package in two modules.
The 4 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:
README | 2 +-
application/sis-console/src/main/artifact/README | 4 +---
.../main/java/org/apache/sis/internal/map/ExceptionPresentation.java | 4 ++--
.../src/main/java/org/apache/sis/internal/map/ListChangeEvent.java | 2 ++
.../src/main/java/org/apache/sis/internal/map/NotifiedList.java | 2 ++
.../src/main/java/org/apache/sis/internal/map/Presentation.java | 4 ++--
.../main/java/org/apache/sis/internal/map/PropertyNameCollector.java | 4 ++--
.../src/main/java/org/apache/sis/internal/map/ResourceSymbolizer.java | 4 ++--
.../src/main/java/org/apache/sis/internal/map/SEPortrayer.java | 4 ++--
.../src/main/java/org/apache/sis/internal/map/SEPresentation.java | 4 ++--
.../src/main/java/org/apache/sis/internal/map/SymbologyVisitor.java | 4 ++--
.../src/main/java/org/apache/sis/internal/map/package-info.java | 4 ++--
.../sis-portrayal/src/main/java/org/apache/sis/portrayal/MapItem.java | 4 ++--
.../src/main/java/org/apache/sis/portrayal/MapLayer.java | 4 ++--
.../src/main/java/org/apache/sis/portrayal/MapLayers.java | 4 ++--
.../apache/sis/internal/{simple => util}/SimpleCharacterIterator.java | 2 +-
.../main/java/org/apache/sis/measure/FormattedCharacterIterator.java | 2 +-
.../java/org/apache/sis/measure/FormattedCharacterIteratorTest.java | 2 +-
pom.xml | 2 +-
.../java/org/apache/sis/storage/WritableGridCoverageResource.java | 4 ++--
20 files changed, 34 insertions(+), 32 deletions(-)
rename core/sis-utility/src/main/java/org/apache/sis/internal/{simple => util}/SimpleCharacterIterator.java (99%)
[sis] 01/04: Update the "non-free" dependency to the next version
to be published.
Posted by de...@apache.org.
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 06081362481ebbfd5d8276f3a13f099c8aa8f28e
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Wed Sep 29 17:15:27 2021 +0200
Update the "non-free" dependency to the next version to be published.
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index deb64ae..ffbb893 100644
--- a/pom.xml
+++ b/pom.xml
@@ -550,7 +550,7 @@
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<sis.plugin.version>${project.version}</sis.plugin.version>
- <sis.non-free.version>1.0</sis.non-free.version> <!-- Used only if "non-free" profile is activated. -->
+ <sis.non-free.version>1.1</sis.non-free.version> <!-- Used only if "non-free" profile is activated. -->
<javafx.version>17</javafx.version> <!-- Used only if "javafx" profile is activated. -->
<geoapi.version>4.0-SNAPSHOT</geoapi.version>
<jaxb.version>2.3.3</jaxb.version>
[sis] 02/04: Edit README files.
Posted by de...@apache.org.
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 a2e60c4f75064879e94206c954f4537a0d999461
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Wed Sep 29 17:26:41 2021 +0200
Edit README files.
---
README | 2 +-
application/sis-console/src/main/artifact/README | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/README b/README
index f21cb15..326b7f2 100644
--- a/README
+++ b/README
@@ -24,7 +24,7 @@ project logo are trademarks of The Apache Software Foundation.
Getting Started
===============
-Running Apache SIS requires Java 8 or higher. Building SIS requires Java 10
+Running Apache SIS requires Java 8 or higher. Building SIS requires Java 17
or higher together with Maven 3 <http://maven.apache.org/> build system.
To build SIS, use the following command in this directory:
diff --git a/application/sis-console/src/main/artifact/README b/application/sis-console/src/main/artifact/README
index ec0b4ba..bb742ef 100644
--- a/application/sis-console/src/main/artifact/README
+++ b/application/sis-console/src/main/artifact/README
@@ -13,9 +13,7 @@ project logo are trademarks of The Apache Software Foundation.
Installation
============
-SIS requires Java 8 or later. If running on Java 9 or later,
-then the Derby JAR file should be added in the bin/ directory.
-See http://sis.apache.org/epsg.html#command-line
+SIS requires Java 8 or later.
Unix
----
[sis] 03/04: Increment the version number of classes that have been
excluded from SIS 1.1 release. We use this information as a note that the
class can be changed during 1.2 development.
Posted by de...@apache.org.
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 0d572ec4a0af82ae7b27f9f280278fa8bdc5ab90
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Wed Sep 29 18:11:06 2021 +0200
Increment the version number of classes that have been excluded from SIS 1.1 release.
We use this information as a note that the class can be changed during 1.2 development.
---
.../main/java/org/apache/sis/internal/map/ExceptionPresentation.java | 4 ++--
.../src/main/java/org/apache/sis/internal/map/ListChangeEvent.java | 2 ++
.../src/main/java/org/apache/sis/internal/map/NotifiedList.java | 2 ++
.../src/main/java/org/apache/sis/internal/map/Presentation.java | 4 ++--
.../main/java/org/apache/sis/internal/map/PropertyNameCollector.java | 4 ++--
.../src/main/java/org/apache/sis/internal/map/ResourceSymbolizer.java | 4 ++--
.../src/main/java/org/apache/sis/internal/map/SEPortrayer.java | 4 ++--
.../src/main/java/org/apache/sis/internal/map/SEPresentation.java | 4 ++--
.../src/main/java/org/apache/sis/internal/map/SymbologyVisitor.java | 4 ++--
.../src/main/java/org/apache/sis/internal/map/package-info.java | 4 ++--
.../sis-portrayal/src/main/java/org/apache/sis/portrayal/MapItem.java | 4 ++--
.../src/main/java/org/apache/sis/portrayal/MapLayer.java | 4 ++--
.../src/main/java/org/apache/sis/portrayal/MapLayers.java | 4 ++--
.../java/org/apache/sis/storage/WritableGridCoverageResource.java | 4 ++--
14 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/ExceptionPresentation.java b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/ExceptionPresentation.java
index 0e433b8..2a9d447 100644
--- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/ExceptionPresentation.java
+++ b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/ExceptionPresentation.java
@@ -32,8 +32,8 @@ import org.opengis.feature.Feature;
* </p>
*
* @author Johann Sorel (Geomatys)
- * @version 1.1
- * @since 1.1
+ * @version 1.2
+ * @since 1.2
* @module
*/
public class ExceptionPresentation extends Presentation {
diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/ListChangeEvent.java b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/ListChangeEvent.java
index 311c830..7853b63 100644
--- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/ListChangeEvent.java
+++ b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/ListChangeEvent.java
@@ -27,6 +27,8 @@ import org.apache.sis.measure.NumberRange;
* Event generated by modified list properties.
*
* @author Johann Sorel (Geomatys)
+ * @version 1.2
+ * @since 1.2
*/
public final class ListChangeEvent<T> extends PropertyChangeEvent {
diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/NotifiedList.java b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/NotifiedList.java
index 20fe558..0677f13 100644
--- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/NotifiedList.java
+++ b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/NotifiedList.java
@@ -25,6 +25,8 @@ import org.apache.sis.measure.NumberRange;
* Decorate a CopyOnWriteArrayList and notify changes when elements are added or removed.
*
* @author Johann Sorel (Geomatys)
+ * @version 1.2
+ * @since 1.2
*/
public abstract class NotifiedList<T> extends AbstractList<T> {
diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/Presentation.java b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/Presentation.java
index 6d15383..580abc5 100644
--- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/Presentation.java
+++ b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/Presentation.java
@@ -46,8 +46,8 @@ import org.opengis.feature.Feature;
* This would be consistent with legacy GO-1 specification (even if retired, it still have worthy material).
*
* @author Johann Sorel (Geomatys)
- * @version 1.1
- * @since 1.1
+ * @version 1.2
+ * @since 1.2
* @module
*/
public abstract class Presentation {
diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/PropertyNameCollector.java b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/PropertyNameCollector.java
index b4aa1b4..696ec0b 100644
--- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/PropertyNameCollector.java
+++ b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/PropertyNameCollector.java
@@ -29,8 +29,8 @@ import org.opengis.filter.ValueReference;
* </p>
*
* @author Johann Sorel (Geomatys)
- * @version 1.1
- * @since 1.1
+ * @version 1.2
+ * @since 1.2
* @module
*/
final class PropertyNameCollector extends SymbologyVisitor {
diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/ResourceSymbolizer.java b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/ResourceSymbolizer.java
index 750b14b..2984463 100644
--- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/ResourceSymbolizer.java
+++ b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/ResourceSymbolizer.java
@@ -28,8 +28,8 @@ import org.opengis.style.Symbolizer;
* </p>
*
* @author Johann Sorel (Geomatys)
- * @version 2.0
- * @since 2.0
+ * @version 1.2
+ * @since 1.2
* @module
*/
public interface ResourceSymbolizer extends Symbolizer {
diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/SEPortrayer.java b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/SEPortrayer.java
index 9b267af..8fc6819 100644
--- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/SEPortrayer.java
+++ b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/SEPortrayer.java
@@ -99,8 +99,8 @@ import org.locationtech.jts.geom.Polygon;
* </ul>
*
* @author Johann Sorel (Geomatys)
- * @version 1.1
- * @since 1.1
+ * @version 1.2
+ * @since 1.2
* @module
*/
public final class SEPortrayer {
diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/SEPresentation.java b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/SEPresentation.java
index b00cbd6..3e0a60a 100644
--- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/SEPresentation.java
+++ b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/SEPresentation.java
@@ -30,8 +30,8 @@ import org.opengis.style.Symbolizer;
* </p>
*
* @author Johann Sorel (Geomatys)
- * @version 2.0
- * @since 2.0
+ * @version 1.2
+ * @since 1.2
* @module
*/
public final class SEPresentation extends Presentation {
diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/SymbologyVisitor.java b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/SymbologyVisitor.java
index 7c352a8..091805a 100644
--- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/SymbologyVisitor.java
+++ b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/SymbologyVisitor.java
@@ -68,8 +68,8 @@ import static org.apache.sis.internal.util.CollectionsExt.nonNull;
* </p>
*
* @author Johann Sorel (Geomatys)
- * @version 1.1
- * @since 1.1
+ * @version 1.2
+ * @since 1.2
* @module
*/
public abstract class SymbologyVisitor {
diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/package-info.java b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/package-info.java
index 304a16e..7a806ba 100644
--- a/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/package-info.java
+++ b/core/sis-portrayal/src/main/java/org/apache/sis/internal/map/package-info.java
@@ -28,8 +28,8 @@
* Synchronization, if desired, must be done by the caller.
*
* @author Johann Sorel (Geomatys)
- * @version 1.1
- * @since 1.1
+ * @version 1.2
+ * @since 1.2
* @module
*/
package org.apache.sis.internal.map;
diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/MapItem.java b/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/MapItem.java
index c39dbd6..573619e 100644
--- a/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/MapItem.java
+++ b/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/MapItem.java
@@ -48,8 +48,8 @@ import org.opengis.util.InternationalString;
* of layers and not a tree of arbitrary objects.
*
* @author Johann Sorel (Geomatys)
- * @version 1.1
- * @since 1.1
+ * @version 1.2
+ * @since 1.2
* @module
*/
public abstract class MapItem extends Observable {
diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/MapLayer.java b/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/MapLayer.java
index 0e5eb59..3c69cf7 100644
--- a/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/MapLayer.java
+++ b/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/MapLayer.java
@@ -39,8 +39,8 @@ import org.opengis.style.Style;
* but the fundamentals aspect of each {@link Feature} or {@link Coverage} should be unchanged.
*
* @author Johann Sorel (Geomatys)
- * @version 1.1
- * @since 1.1
+ * @version 1.2
+ * @since 1.2
* @module
*/
public class MapLayer extends MapItem {
diff --git a/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/MapLayers.java b/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/MapLayers.java
index 09970ba..4908b10 100644
--- a/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/MapLayers.java
+++ b/core/sis-portrayal/src/main/java/org/apache/sis/portrayal/MapLayers.java
@@ -47,8 +47,8 @@ import org.opengis.referencing.operation.TransformException;
* which should be zoomed by default when the map is rendered.</p>
*
* @author Johann Sorel (Geomatys)
- * @version 1.1
- * @since 1.1
+ * @version 1.2
+ * @since 1.2
* @module
*/
public class MapLayers extends MapItem {
diff --git a/storage/sis-storage/src/main/java/org/apache/sis/storage/WritableGridCoverageResource.java b/storage/sis-storage/src/main/java/org/apache/sis/storage/WritableGridCoverageResource.java
index 098680e..cd5c04b 100644
--- a/storage/sis-storage/src/main/java/org/apache/sis/storage/WritableGridCoverageResource.java
+++ b/storage/sis-storage/src/main/java/org/apache/sis/storage/WritableGridCoverageResource.java
@@ -26,8 +26,8 @@ import org.apache.sis.coverage.grid.GridGeometry;
* be controlled by options, which may be {@link DataStore}-specific.
*
* @author Johann Sorel (Geomatys)
- * @version 1.1
- * @since 1.1
+ * @version 1.2
+ * @since 1.2
* @module
*/
public interface WritableGridCoverageResource extends GridCoverageResource {
[sis] 04/04: Move an internal class for avoiding to have a
`org.apache.sis.internal.simple` package in two modules.
Posted by de...@apache.org.
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 57034736de4bbb5501ea63fab83da285d6c5d9c3
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Wed Sep 29 18:57:31 2021 +0200
Move an internal class for avoiding to have a `org.apache.sis.internal.simple` package in two modules.
---
.../apache/sis/internal/{simple => util}/SimpleCharacterIterator.java | 2 +-
.../main/java/org/apache/sis/measure/FormattedCharacterIterator.java | 2 +-
.../java/org/apache/sis/measure/FormattedCharacterIteratorTest.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleCharacterIterator.java b/core/sis-utility/src/main/java/org/apache/sis/internal/util/SimpleCharacterIterator.java
similarity index 99%
rename from core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleCharacterIterator.java
rename to core/sis-utility/src/main/java/org/apache/sis/internal/util/SimpleCharacterIterator.java
index 02d8698..e28b898 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/internal/simple/SimpleCharacterIterator.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/internal/util/SimpleCharacterIterator.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.simple;
+package org.apache.sis.internal.util;
import java.io.Serializable;
import java.text.CharacterIterator;
diff --git a/core/sis-utility/src/main/java/org/apache/sis/measure/FormattedCharacterIterator.java b/core/sis-utility/src/main/java/org/apache/sis/measure/FormattedCharacterIterator.java
index d1580c1..ea5c6b9 100644
--- a/core/sis-utility/src/main/java/org/apache/sis/measure/FormattedCharacterIterator.java
+++ b/core/sis-utility/src/main/java/org/apache/sis/measure/FormattedCharacterIterator.java
@@ -28,7 +28,7 @@ import java.text.AttributedCharacterIterator;
import org.apache.sis.util.ArgumentChecks;
import org.apache.sis.util.collection.Containers;
import org.apache.sis.internal.converter.SurjectiveConverter;
-import org.apache.sis.internal.simple.SimpleCharacterIterator;
+import org.apache.sis.internal.util.SimpleCharacterIterator;
/**
diff --git a/core/sis-utility/src/test/java/org/apache/sis/measure/FormattedCharacterIteratorTest.java b/core/sis-utility/src/test/java/org/apache/sis/measure/FormattedCharacterIteratorTest.java
index d641854..19892f4 100644
--- a/core/sis-utility/src/test/java/org/apache/sis/measure/FormattedCharacterIteratorTest.java
+++ b/core/sis-utility/src/test/java/org/apache/sis/measure/FormattedCharacterIteratorTest.java
@@ -22,7 +22,7 @@ import java.util.HashSet;
import java.text.AttributedCharacterIterator;
import org.apache.sis.test.TestCase;
import org.apache.sis.test.DependsOnMethod;
-import org.apache.sis.internal.simple.SimpleCharacterIterator;
+import org.apache.sis.internal.util.SimpleCharacterIterator;
import org.junit.Test;
import static java.lang.StrictMath.min;