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-site.git
The following commit(s) were added to refs/heads/main by this push:
new 492491ef Update release instruction and set version numbers.
492491ef is described below
commit 492491ef255995c5487dc9d151c1bf77f0eb9e5d
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Sat Dec 10 13:33:52 2022 +0100
Update release instruction and set version numbers.
---
.gitignore | 7 ++
content/_index.md | 2 +-
content/command-line.md | 6 +-
.../developer-guide/introduction/Installation.html | 2 +-
content/release-management.md | 79 +++++++++++++++-------
content/release-notes/1.3.md | 2 +-
static/DOAP.rdf | 14 ++++
7 files changed, 82 insertions(+), 30 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..0c8bd711
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+*.tmp
+*.log
+.hugo_build.lock
+public/
+
+# Generated by MacOS
+.DS_Store
diff --git a/content/_index.md b/content/_index.md
index 0347e4df..c375e869 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -59,7 +59,7 @@ The API and the data encodings follow [international
standards](standards.html)
## Using Apache SIS {#user}
-The latest SIS release is {{% version %}}, released May 2022,
+The latest SIS release is {{% version %}}, released December 2023,
and can be [downloaded](downloads.html) as a `zip` files or as Maven
dependencies.
Apache {{% SIS %}} requires Java 17 or higher for [building](build.html), but
can be executed on Java 8 or higher.
The EPSG geodetic dataset is optional for licensing reasons, but recommended.
diff --git a/content/command-line.md b/content/command-line.md
index e50ed670..3480c800 100644
--- a/content/command-line.md
+++ b/content/command-line.md
@@ -138,7 +138,7 @@ sis crs EPSG:6676
Scope["Large and medium scale topographic mapping, cadastral and engineering
survey."],
Area["Japan - onshore - Honshu between approximately 137°45'E and 139°E -
Niigata-ken; Nagano-ken; Yamanashi-ken; Shizuoka-ken."],
BBox[34.54, 137.32, 38.58, 139.91],
- Id["EPSG", 6676, "9.7", URI["urn:ogc:def:crs:EPSG:9.7:6676"]],
+ Id["EPSG", 6676, "9.9.1", URI["urn:ogc:def:crs:EPSG:9.9.1:6676"]],
Remark["Replaces JGD2000 / Japan Plane Rectangular CS VIII (CRS code 2450)
with effect from 21st October 2011."]]</pre>
</details>
<br/>
@@ -200,7 +200,7 @@ sis identifier
https://sis.apache.org/examples/crs/MissingIdentifier.wkt
produces an output like below:
{{< highlight text >}}
-urn:ogc:def:crs:EPSG:9.7:27572 | NTF (Paris) / Lambert zone II
+urn:ogc:def:crs:EPSG:9.9.1:27572 | NTF (Paris) / Lambert zone II
{{< / highlight >}}
As we can see, Apache {{% SIS %}} has been able to find back the identifier
code and the actual {{% CRS %}} name.
@@ -256,7 +256,7 @@ sis identifier
https://sis.apache.org/examples/crs/EquivalentDefinition.wkt
produces an output like below:
{{< highlight text >}}
-urn:ogc:def:crs:EPSG:9.7:3994 | WGS 84 / Mercator 41
+urn:ogc:def:crs:EPSG:9.9.1:3994 | WGS 84 / Mercator 41
{{< / highlight >}}
In above example, Apache {{% SIS %}} used the fact that a
diff --git a/content/developer-guide/introduction/Installation.html
b/content/developer-guide/introduction/Installation.html
index 18f1e5b0..d34e6f77 100644
--- a/content/developer-guide/introduction/Installation.html
+++ b/content/developer-guide/introduction/Installation.html
@@ -47,7 +47,7 @@
see <a href="../../epsg.html">How to use EPSG geodetic dataset</a>
page for more information.
</p>
<pre><properties>
- <sis.version>1.2</sis.version>
+ <sis.version>1.3</sis.version>
</properties>
<dependencies>
<dependency>
diff --git a/content/release-management.md b/content/release-management.md
index 5784a183..3a133800 100644
--- a/content/release-management.md
+++ b/content/release-management.md
@@ -46,7 +46,8 @@ in this page shall be adjusted accordingly.
│ ├─ distribution
│ │ └─ $NEW_VERSION
│ │ └─ RC$RELEASE_CANDIDATE
- │ └─ integration-test
+ │ └─ tests
+ │ ├─ integration
│ └─ maven
└─ site
├─ main
@@ -123,8 +124,8 @@ Update [JIRA][JIRA] tasks and prepare release notes as
below:
* Ensure that the _Fix Version_ in issues resolved since the last release
includes this release version correctly.
* Ensure that all open issues are resolved or closed before proceeding further.
-* On the `site` source code repository, create a
`static/release-notes/$NEW_VERSION.html` file with all the features added.
-* Use `static/release-notes/$OLD_VERSION.html` as a template, omitting the old
list of issues.
+* On the `site` source code repository, create a
`content/release-notes/$NEW_VERSION.md` file with all the features added.
+* Use `content/release-notes/$OLD_VERSION.md` as a template, omitting the old
list of issues.
* The release notes can be obtained from JIRA, by clicking on the _Versions_
tab → the version number → _Release notes_
and then configuring the release notes to display HTML format and copying it.
A suggested approach would be to reorganize the release notes as
@@ -135,9 +136,9 @@ Commit to staging area (not published immediately):
{{< highlight bash >}}
cd ../site/main
-cp static/release-notes/$OLD_VERSION.html
static/release-notes/$NEW_VERSION.html
+cp content/release-notes/$OLD_VERSION.md content/release-notes/$NEW_VERSION.md
# Edit release notes before to continue.
-git add static/release-notes/$NEW_VERSION.html
+git add content/release-notes/$NEW_VERSION.md
git commit --message "Release notes for Apache SIS $NEW_VERSION."
{{< / highlight >}}
@@ -209,7 +210,7 @@ Move to the `target` directory and execute all examples
documented in the [comma
with the `sis` command replaced by the following:
{{< highlight bash >}}
- java -classpath "binaries/*" -enableassertions
org.apache.sis.console.Command
+java -classpath "binaries/*" -enableassertions org.apache.sis.console.Command
{{< / highlight >}}
## Prepare non-free resources {#maven-nonfree}
@@ -234,7 +235,7 @@ Verify the configuration and version of Maven plugins.
Then test and commit (note that execution may be slow).
{{< highlight bash >}}
-cd ../distribution/integration-test
+cd ../releases/tests
svn update
cd maven
mvn clean test
@@ -252,7 +253,7 @@ If above verifications succeeded, performs the following
_temporary_ changes
This hack will force us to skip test compilations.
Then deploy SIS (without test JAR files).
-Deploy also the non-free resources in a staging repository separated from the
rest of Apache {{% SIS %}}.
+Deploy also the non-free resources in the same staging repository.
If there is any issue with this deployment, the staging repository can easily
be dropped and recreated.
{{< highlight bash >}}
@@ -301,17 +302,23 @@ of the temporary Maven repository created by Nexus.
Usually, only the 3 last digits need to be updated.
{{< highlight bash >}}
-cd ../releases/integration-test/maven
+cd ../releases/tests/maven
# Edit <url> in pom.xml before to continue.
mvn compile
svn commit -m "Test project for SIS $NEW_VERSION-RC$RELEASE_CANDIDATE"
{{< / highlight >}}
Create a temporary directory where Apache {{% SIS %}} will write the EPSG
dataset.
+Force the Java version to the one supported by Apache SIS (adjust `JDK8_HOME`
as needed).
+Specify the URL to the nexus repository (will be needed in a future step.
Replace `####` as needed).
{{< highlight bash >}}
mkdir target/SpatialMetadata
export SIS_DATA=`pwd`/target/SpatialMetadata
+export JAVA_HOME=$JDK8_HOME
+export JAVA_OPTS=-Dorg.apache.sis.epsg.downloadURL
+export
JAVA_OPTS=$JAVA_OPTS=https://repository.apache.org/content/repositories/orgapachesis-####
+export
JAVA_OPTS=$JAVA_OPTS/org/apache/sis/non-free/sis-epsg/$NEW_VERSION/sis-epsg-$NEW_VERSION.jar
{{< / highlight >}}
Clear the local Maven repository in order to force downloads from the Nexus
repository, then test.
@@ -319,13 +326,13 @@ This will also verify the checksums.
{{< highlight bash >}}
rm -r ~/.m2/repository/org/apache/sis
-mvn package --strict-checksums
+mvn package --show-version --strict-checksums
{{< / highlight >}}
Verify that the EPSG dataset has been created, then cleanup:
{{< highlight bash >}}
-ll $SIS_DATA/Databases/SpatialMetadata
+du --summarize --human-readable $SIS_DATA/Databases/SpatialMetadata
mvn clean
{{< / highlight >}}
@@ -369,7 +376,7 @@ Move the files generated by Maven to the distribution
directory:
{{< highlight bash >}}
mv $SIS_RC_DIR/target/sis-$NEW_VERSION-* .
mv $SIS_RC_DIR/target/site/apache-sis-$NEW_VERSION-* .
-mv $SIS_RC_DIR/target/distribution/apache-sis-$NEW_VERSION.zip .
+mv
$SIS_RC_DIR/application/sis-javafx/target/distribution/apache-sis-$NEW_VERSION.zip
.
{{< / highlight >}}
Rename the files to something more conform to the convention seen in other
Apache projects:
@@ -380,7 +387,7 @@ mv sis-$NEW_VERSION-source-release.zip
apache-sis-$NEW_VERSION-src.zip
mv sis-$NEW_VERSION-source-release.zip.asc apache-sis-$NEW_VERSION-src.zip.asc
{{< / highlight >}}
-## Sign and commit {#sign}
+## Sign, test and commit {#sign}
Sign the source, javadoc and binary artifacts:
@@ -401,20 +408,13 @@ find . -name "*.sha512" -exec sha512sum --check '{}' \;
find . -name "*.asc" -exec gpg --verify '{}' \;
{{< / highlight >}}
-Commit:
-
-{{< highlight bash >}}
-svn add apache-sis-$NEW_VERSION-*
-cd ../..
-svn commit --message "SIS release candidate $RELEASE_CANDIDATE"
-{{< / highlight >}}
-
## Update online Javadoc {#apidocs}
-Copy the Javadoc to the web site staging directory:
+Copy the Javadoc to the web site staging directory.
+Updated Javadoc will be committed locally but not pushed yet.
{{< highlight bash >}}
-cd ../site/javadoc
+cd ../../site/javadoc
rm -r *
git reset -- README.md
git checkout -- README.md
@@ -422,7 +422,37 @@ unzip $DIST_DIR/apache-sis-$NEW_VERSION-doc.zip
mv apidocs/* .
rmdir apidocs
git add -A
-git commit --message "Update javadoc for SIS $NEW_RELEASE."
+git commit --message "Update javadoc for SIS $NEW_VERSION."
+firefox index.html
+{{< / highlight >}}
+
+Test the JavaFX and console applications (see [command-line interface
page](./command-line.html)
+for details about expected output of `sis` command):
+
+{{< highlight bash >}}
+cd
+mkdir tmp; cd tmp
+unzip $DIST_DIR/apache-sis-$NEW_VERSION-bin.zip
+wget https://sis.apache.org/examples/coordinates/AmericanCities.csv
+wget https://sis.apache.org/examples/coordinates/CanadianCities.csv
+./apache-sis-$NEW_VERSION/bin/sis crs EPSG:6676
+./apache-sis-$NEW_VERSION/bin/sis identifier
https://sis.apache.org/examples/crs/MissingIdentifier.wkt
+./apache-sis-$NEW_VERSION/bin/sis identifier
https://sis.apache.org/examples/crs/WrongAxisOrder.wkt
+./apache-sis-$NEW_VERSION/bin/sis identifier
https://sis.apache.org/examples/crs/EquivalentDefinition.wkt
+./apache-sis-$NEW_VERSION/bin/sis transform --sourceCRS EPSG:4267 --targetCRS
EPSG:4326 AmericanCities.csv
+./apache-sis-$NEW_VERSION/bin/sis transform --sourceCRS EPSG:4267 --targetCRS
EPSG:4326 CanadianCities.csv
+./apache-sis-$NEW_VERSION/bin/sisfx
+cd ..
+rm -r tmp
+cd $DIST_DIR
+{{< / highlight >}}
+
+Commit:
+
+{{< highlight bash >}}
+svn add apache-sis-$NEW_VERSION-*
+cd ../..
+svn commit --message "SIS $NEW_VERSION release candidate $RELEASE_CANDIDATE"
{{< / highlight >}}
## Test the release {#test}
@@ -498,6 +528,7 @@ find . -name "*.xml" -type f -exec sed -i
's/[[:space:]]*$//' '{}' \;
# Commit
git add --all
git commit --message "Staging repository for the $NEW_VERSION release."
+git push
```
{{< / highlight >}}
diff --git a/content/release-notes/1.3.md b/content/release-notes/1.3.md
index fc2eaa0a..cef0857d 100644
--- a/content/release-notes/1.3.md
+++ b/content/release-notes/1.3.md
@@ -2,7 +2,7 @@
title: SIS 1.3 Release notes
---
-* Release date: **2022-12-19**
+* Release date: **2022-12-23**
* Next release
* [Previous release](1.2.html)
* [Incompatible changes](#compatibility)
diff --git a/static/DOAP.rdf b/static/DOAP.rdf
index c35f5cce..30f4adb1 100644
--- a/static/DOAP.rdf
+++ b/static/DOAP.rdf
@@ -97,6 +97,13 @@
<asfext:id>ISO 19139:2007</asfext:id>
</asfext:Standard>
</asfext:implements>
+ <asfext:implements>
+ <asfext:Standard>
+ <asfext:title>Geographic information — Data Quality</asfext:title>
+ <asfext:body>International Organization for
Standardization</asfext:body>
+ <asfext:id>ISO 19157:2013</asfext:id>
+ </asfext:Standard>
+ </asfext:implements>
<asfext:implements>
<asfext:Standard>
<asfext:title>Geographic information — Spatial referencing by
coordinates</asfext:title>
@@ -153,6 +160,13 @@
<asfext:id>OGC 19-008r4</asfext:id>
</asfext:Standard>
</asfext:implements>
+ <release>
+ <Version>
+ <name>Apache SIS 1.3 — data quality</name>
+ <created>2022-12-23</created>
+ <revision>1.3</revision>
+ </Version>
+ </release>
<release>
<Version>
<name>Apache SIS 1.2 — more formats and operations</name>
