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/11/28 17:29:59 UTC
(sis) branch geoapi-3.1 updated (e55d695764 -> 7f124c7bc5)
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 e55d695764 Merge branch 'geoapi-4.0' into geoapi-3.1
add ad045a37bf Revert the deletion of `AbstractGridCoverageResource.getEnvelope()`, but with redirection to the default method defined in the interface.
add 516dfb985f Build configuration: remove `sis.library-conventions.gradle.kts` because it depends on `kotlin-dsl`, which is not compatible with Java 21. Even if Apache SIS targets Java 11, we want it to compile with newer Java versions.
new 7f124c7bc5 Merge branch 'geoapi-4.0' into geoapi-3.1
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:
buildSrc/build.gradle.kts | 1 -
.../main/kotlin/sis.library-conventions.gradle.kts | 68 ----------------------
endorsed/build.gradle.kts | 15 ++++-
.../sis/storage/AbstractGridCoverageResource.java | 15 +++++
gradle.properties | 13 +++++
incubator/build.gradle.kts | 16 ++++-
optional/build.gradle.kts | 15 ++++-
7 files changed, 70 insertions(+), 73 deletions(-)
delete mode 100644 buildSrc/src/main/kotlin/sis.library-conventions.gradle.kts
create mode 100644 gradle.properties
(sis) 01/01: Merge branch 'geoapi-4.0' into geoapi-3.1
Posted by de...@apache.org.
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 7f124c7bc55bc45c9a5f46a7cdca3c1e9683f790
Merge: e55d695764 516dfb985f
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Tue Nov 28 18:18:48 2023 +0100
Merge branch 'geoapi-4.0' into geoapi-3.1
buildSrc/build.gradle.kts | 1 -
.../main/kotlin/sis.library-conventions.gradle.kts | 68 ----------------------
endorsed/build.gradle.kts | 15 ++++-
.../sis/storage/AbstractGridCoverageResource.java | 15 +++++
gradle.properties | 13 +++++
incubator/build.gradle.kts | 16 ++++-
optional/build.gradle.kts | 15 ++++-
7 files changed, 70 insertions(+), 73 deletions(-)
diff --cc gradle.properties
index 0000000000,df07faace3..e9b032a650
mode 000000,100644..100644
--- a/gradle.properties
+++ b/gradle.properties
@@@ -1,0 -1,13 +1,13 @@@
+ #
+ # Branch-specific or tag-specific properties of Apache SIS.
+ # This file provides a single location where version number
+ # and deployment URL can be changed before new tags.
+ #
-version=2.0-SNAPSHOT
++version=1.x-SNAPSHOT
+
+ # Following identifiers should match <server> elements in the Maven settings.xml file.
+ # They are used for fetching the credentials for publishing binaries in a repository.
+ snapshotsId = apache.snapshots.https
+ releasesId = apache.releases.https
+ snapshotsURL = https://repository.apache.org/content/repositories/snapshots
+ releasesURL = https://repository.apache.org/service/local/staging/deploy/maven2