diff --git a/README.md b/README.md
index 2b4fe37d1..da278e333 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,40 @@ Jekyll can also be run in "watch" mode for development:
jekyll serve -w
-The site contents will be served at http://localhost:4000.
+The site contents will be served at [http://localhost:4000](http://localhost:4000).
+
+See [TEST.md](TEST.md) for more details.
+
+## Blog
+
+Blog posts have migrated from wordpress and are now managed as part of the website.
+
+To create a new blog post:
+
+1. Create a new markdown page in ``_posts`` following the filename convention for sort order:
+
+ ``_posts/2021-05-04-may-the-fork-be-with-you.md``
+
+2. The post is published using the metadata included at the top of your file.
+
+ ```
+ ---
+ author: Andrea Aime
+ date: 2021-05-01
+ layout: post
+ title: May the fork be with you!
+ categories:
+ - Developer notes
+ ---
+ ```
+
+3. Popular categories include:
+
+ * ``Developer notes``
+ * ``Announcements`` -- used for project team and release announcements
+ * ``Tips and Tricks``
+ * ``Tutorials``
+ * ``User perspectives``
## Releases
@@ -35,11 +68,41 @@ process of updating site contents for a stable release.
2. Update the value of ``jira_version`` in ``release/2.7.x/index.html`` to be the same as the next release.
+3. Write a blog post announcing the new release.
+
+ ```
+ ---
+ author: Andrea Aime
+ comments: false
+ date: 2021-01-20
+ layout: post
+ title: GeoServer 2.18.2 Released
+ categories:
+ - Announcements
+ tags:
+ - Release
+ ---
+ ```
+
+ Copy one of the previous blog posts so we end up with a consistent format.
+
3. Copy stable to the appropriate version number (so your blog post has something to link to). For example if the ``version`` is ``2.7.2`` make a copy using:
cp -r release/stable release/2.7.2
For a maintenance or development release, instead copy ``release/maintain`` or ``release/dev`` respectively.
+
+ ```
+ ---
+ layout: release_218
+ title: GeoServer
+ version: 2.18.2
+ jira_version: 16803
+ release_date: January 20th, 2021
+ announce: announcements/2021/01/20/geoserver-2-18-2-released.html
+ ---
+ ```
+
4. Update ``_config.yml`` and update the ``stable_version`` property to the current version. This change will be reflected in ``index.html`` and ``download/index.html``. For a maintenance or development release, instead change ``maintain_version`` or ``dev_version`` respectively.
@@ -61,7 +124,9 @@ process of updating site contents for a stable release.
2.10-M0
- There are seperate sections for `stable` and `maintenance`. Ensure you have the right section, then add a line to the top of the list for your version. Try to keep the lists balanced, and limit each list to no more than 4 items - create a third list row if necessary. Isolate milestones, beta and RC on their own row if you can.
+ There are separate sections for `stable` and `maintenance`. Ensure you have the right section, then add a line to the top of the list for your version. Try to keep the lists balanced, and limit each list to no more than 4 items - create a third list row if necessary. Isolate milestones, beta and RC on their own row if you can.
+
+### Development releases
When publishing a milestone, beta or release candidate:
@@ -71,6 +136,8 @@ When publishing a milestone, beta or release candidate:
* Update ``release/dev/index.html`` to reflect the new branch, and change the ``dev_version`` property in ``_config.yml``.
+### Final Release
+
When creating the final release:
1. Change all the entries for ``release/maintain/index.html``, ``release/stable/index.html``, and ``release/master/index.html`` to reflect the new branch identities.
diff --git a/TEST.md b/TEST.md
index d19f295bf..fedfcc403 100644
--- a/TEST.md
+++ b/TEST.md
@@ -1,19 +1,19 @@
Testing the site locally
------------------------
-It is possible to test the web site before committing, full instructions available here:
-https://docs.github.com/en/github/working-with-github-pages/testing-your-github-pages-site-locally-with-jekyll
+It is possible to test the web site before committing, full instructions available here: [Testing your GitHub Pages site locally with Jekyll](
+https://docs.github.com/en/github/working-with-github-pages/testing-your-github-pages-site-locally-with-jekyll)
-If you have aleady installed all the dependencies, just run:
+If you have already installed all the dependencies, just run:
```
-bundle exec jekyll serve
+bundle exec jekyll serve --watch
```
-and then navigate to ``http://localhost:4000``.
+Then navigate to [http://localhost:4000](http://localhost:4000).
Not finding the blog post you just wrote? It could be, because it's labelled for a future date (and you are preparing in advance).
-If that's the case, it can be shown by adding ``--future`` to the jekill startup:
+If that's the case, it can be shown by adding ``--future`` to the jekyll startup:
```
bundle exec jekyll serve --future
diff --git a/_config.yml b/_config.yml
index 7b88e7af6..318ef9d0d 100644
--- a/_config.yml
+++ b/_config.yml
@@ -12,8 +12,8 @@ stable_version: 2.18.2
stable_branch: 2.18.x
maintain_version: 2.17.5
maintain_branch: 2.17.x
-dev_version:
-dev_branch: master
+dev_version: 2.19-RC
+dev_branch: main
timezone: UTC
name: GeoServer
diff --git a/_layouts/nightly.html b/_layouts/nightly.html
index 6b7cd816e..f6bbf778a 100644
--- a/_layouts/nightly.html
+++ b/_layouts/nightly.html
@@ -126,7 +126,6 @@ Extensions
Vector Formats
+ Security
+
diff --git a/_layouts/release_219.html b/_layouts/release_219.html
new file mode 100644
index 000000000..bd6d2224a
--- /dev/null
+++ b/_layouts/release_219.html
@@ -0,0 +1,274 @@
+
+
+
+
+ {% include head.html %}
+
+
+ {% include nav.html %}
+
+
+
+
+
+
GeoServer {{ page.version }}
+
+ Released on {{ page.release_date }}
+
+
+
+
+
+
+
+
+
Changelog
+
+ JIRA release {{page.jira_version}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Packages
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Web Archive
+
+ Web Archive (war) for servlet containers.
+
+
+
+
+
+
+
+ Documentation
+
+
+
+
+
+
+
+
User Guide
+
HTML
+
+ Export of GeoServer user guide.
+
+
+
+
+
+
+
+
+
+
+
Javadoc
+
+ API documentation.
+
+
+
+
+
+
+
+ Source Code
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
GitHub
+
+ Browse source code on GitHub.
+
+
+
+
+
+
+
+ Extensions
+
+
+
+
+
+
+
+
Extensions
+
+ GeoServer Extension downloads.
+
+
+
+
+
+
+
Vector Formats
+
+
Cartography
+
+
Miscellaneous
+
+
Security
+
+
+
+
Coverage Formats
+
+
Output Formats
+
+
Services
+
+
+
+
+
+ {% include footer.html %}
+
+*Editing a layer's MapML properties in the Layers panel*
+
+
+*Editing a layer's MapML gridsets in the Layers panel Tile Caching tab*
+
+
+*Preview a layer in the MapML viewer by following the MapML link*
+
+
+*Mash up MapML previews by drag and drop*
+
+The Maps for HTML community would like to thank Andrea Aime, Jody Garnett and the
+GeoServer PSC for their support and help in getting this extension published.
+
+More information on the GeoServer MapML extension is available in the
+[user guide](https://docs.geoserver.org/latest/en/user/extensions/mapml/index.html)
+
+## WPS JDBC extension
+
+The WPS JDBC extension allows to share the status of asynchronous WPS requests across a GeoServer cluster. The status of
+all requests, past and ongoing, can be stored in a database, for later reference.
+
+The module uses GeoTools JDBC stores to access databases, create the necessary tables, and track status.
+Connection parameters are provided as property files, e.g.:
+
+
+```
+user=postgres
+port=5432
+password=******
+passwd=******
+host=localhost
+database=gsstore
+driver=org.postgresql.Driver
+dbtype=postgis
+```
+
+For more information, refer to the [module documentation](https://docs.geoserver.org/latest/en/user/extensions/wps-jdbc/index.html).
+
+We'd like to thank Ian Turton for developing the module on behalf of GeoSolutions, Alessio Fabiani (GeoSolutions) for providing
+documentation for it, and Andrea Aime (GeoSolutions) for performing the QA and graduation steps.
+
+## WPS Download extension
+
+The WPS download plugin provides support for the download of large amounts of data,
+allowing use of asynchronous requests, where using WFS, WCS or WMS for the same task would lead to HTTP timeouts.
+Also, download limits can be configured to avoid excessively large requests: size in MB, number of features, number
+of animation frames.
+
+In particular, the following processes are available:
+
+* ``DownloadEstimator``, verifying that a raster/vector download about to be attempted will fit the download limits.
+* ``DownloadProcess``, allowing to download either raster or vector data, reproject and clip them
+* ``DownloadMapProcess``, allows to download a large map matching what is visible on a client (which may be using tiles and display on a multi-screen), eventually dynamically fetching layers from remote WMS servers as well. It's also possible to decorate the final map using the standard [decoration layouts](https://docs.geoserver.org/latest/en/user/services/wms/decoration.html#wms-decorations).
+* ``DownloadAnimationProcess``, allows to build a MP4 movie given a set of layers and times.
+
+GeoNode uses the module to allow download of datasets, eventually clipped and filtered to the current view. The asynchronous download allows
+to download large datasets, and retrieve them later, once ready.
+
+
+*Initiating a download in GeoNode*
+
+
+*Configuring the download*
+
+
+*The download package is ready*
+
+
+*Viewing the clipped download in QGIS*
+
+For more information, refer to the [module documentation](https://docs.geoserver.org/latest/en/user/extensions/wps-download/index.html).
+
+Thanks to Alessio, Andrea, Daniele, from GeoSolutions, for developing the extension, and GeoNode/MapStore for testing it in various production environments.
+
+## WMTS Multidimensional extension
+
+The WMTS multi-dimensional extension is an extension to the WMTS protocol developed during OGC Testbed 12. The extension allows to explore
+the dimensions attached to a dataset, providing ways to explore them, finding relationships between them.
+
+Here are a couple of real world examples of this functionality:
+
+* GeoServer is publishing a set of satellite images. Each image is time stamped. The user is browsing the set of data on a map, and the client software wants to show the list of available times for the current area. The WMS/WMTS dimension support cannot help, but the WMTS extension has a request, ``GetDomainValues``, which exactly answers this question.
+* GeoServer is publishing a set of NetCDFs containing weather forecasts. Each dataset has two times associated, a run time (the time the forecast was run) and a time (the predicted time for the weather data). Forecasts are run for the short term future, so the two times are strictly related. A user wants to compare forecasts for a given predicted time. The ``GetDomainValues`` request can be used to locate the run times that have a prediction for the given forecast time.
+* GeoServer is publishing a set of timestamped data. The client wants to display a timeline, providing an idea of which times are available for the current view. In addition to that, the clients wants to display how many datasets are available along the timeline. The ``GetHistogram`` request can be used to retrieve a count of datasets available over time buckets in a given interval.
+
+The [MapStore client](https://mapstore.readthedocs.io/en/latest/) uses the module to power its [timeline extension](https://mapstore.readthedocs.io/en/v2019.02.00/user-guide/timeline/), providing time discovery, navigation, animation, and histogram display.
+
+
+*MapStore timeline plugin, with animation controls*
+
+
+*MapStore timeline plugin, histogram view*
+
+For more information, refer to the [module documentation](https://docs.geoserver.org/latest/en/user/extensions/wmts-multidimensional/index.html).
+
+Thanks to Nuno Oliveira (GeoSolutions) and Andrea Aime (GeoSolutions) for the initial development, and MapStore for adopting the module, using it in production, and ensuring its long term development
+
+## Params-extractor extension
+
+The parameter extractor module is used to inject vendor parameters in all links that a standard OGC client uses, by either
+reflecting them into the Capabilities documents backlinks, or hiding them in an extra component in the URLs paths.
+
+This can be used, for example, to provide a desktop client, such as QGIS, a different view of a given layer based on ``viewparams``, ``cql_filter``
+or ``env`` parameters, even if the client would not be able to use the parameters natively.
+Each combination of parameters receives a different starting GetCapabilities request.
+
+A simple query parameter echoing can be setup for clients honoring query parameters in capabilities backlinks:
+
+
+*Parameter extractor echoing*
+
+For clients ignoring query parameters or even ignoring backlinks, the parameters can be added as a path component instead, and then expanded in a larger templated value:
+
+
+*Parameter expansion from path component*
+
+With the above setup, a URL ending with ``H11``:
+
+``
+/geoserver/tiger/wms/H11?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap
+``
+
+is interpreted as:
+
+``
+/geoserver/tiger/wms?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&CQL_FILTER=CFCC%3D%27H11%27
+``
+
+For more information, refer to the [module documentation](https://docs.geoserver.org/stable/en/user/extensions/params-extractor/index.html).
+
+Thanks to Nuno Oliveira (GeoSolutions) for developing this module.
+
+
+## GeoWebCache-S3 extension
+
+The GeoWebCache S3 blobstore allows to store GeoWebCache tiles in a S3 bucket. It has been also tested with a few other S3 compatible blob
+storage mechanisms, such as [Minio](https://min.io/).
+
+This plugin is particularly useful when deploying GeoServer on AWS, but also when setting up a shared tile storage in Kubernetes.
+
+
+*Setting up the S3 tile storage*
+
+For more information, refer to the [module documentation](https://docs.geoserver.org/latest/en/user/extensions/gwc-s3/index.html).
+
+
+## Retire ArcSDE Extensions
+
+The ArcSDE Extension has been retired.
+
+In this case we found that the extension is no longer actively used, and lacked sufficient feedback and resources for continued development. The last tested ArcSDE 10.2.2 version is no longer available, making the required jars required for installation unavailable.
+
+
+## Retire the Script community module
+
+The Script community module has been retired.
+
+The module provided scripting abilities for GeoServer, allowing to add WPS processes and small REST services in scripting languages,
+and storing them in the data directory.
+
+Unfortunately the module fell un-maintained and would no longer build nor work.
+
+
+## Codebase updates and Quality Assurance
+
+GeoServer continues to be build with the latest open source technologies:
+
+* GeoTools 26-RC
+* GeoWebCache 1.19-RC
+* JAI-EXT 1.1.19
+* JTS 1.18.1
+* GeoFence 3.4.7
+* Upgrade oshi-core from 5.4.0 to 5.5.0 for new Apple hardware support
+* Freemarker 2.3.31
+
+We do not get a chance to talk about the code-base that makes up GeoServer often, but recent changes and improvements deserve some praise. The GeoServer team has really embraced automating code checks, starting with simply formatting the code in a consistent fashion, to more advanced techniques checking for common mistakes.
+
+* Switch most of the unit tests from JUnit 3 to JUnit 4
+* Remove usage of Vector/Hashtable, replace with ArrayList and HashMap, add PMD rule to enforce it
+* Remove un-necessary casts from code, add PMD rule to enforce it
+* Replace try/finally with try-with-resources, add a PMD rule to enforce it
+* Collapse catch statements with the same body in a multi-catch, add PMD rule to enforce it
+* Avoid assertTrue for tests that can be expressed with dedicated assertions. Add PMD rule to enforce it.
+* Replace iterator loops with enhanced for loops, add a QA rule to enforce it.
+* Run PMD checks on test sources as well.
+* Use Collection.isEmpty() when checking for item availability
+* Remove explicit types when diamond operator can be used instead. Added a PMD rule to enforce it.
+* Remove or suppress unchecked casts, enable the Java compiler lint option for it.
+
+Although all these changes sound small in isolation, the fact that they are performed on the entire codebase, and checked each time a pull-request is proposed, really provides confidence in the technology we publish.
+
+Thanks to Andrea for this valuable work.
+
+## And more!
+
+There are several other new features and improvements, including:
+
+ * Upgrade SQL Server packaging to use open source JDBC driver
+ * Setting Entity Expansion limit on WFS XML Readers
+ * Tutorial on [running GeoServer in cloud foundry](https://docs.geoserver.org/latest/en/user/tutorials/cloud-foundry/run_cf.html).
+ * Updated DB2 [installation instructions](https://docs.geoserver.org/latest/en/user/data/database/db2.html)
+
+
+Find out more in the [release notes](https://osgeo-org.atlassian.net/secure/ReleaseNote.jspa?projectId=10000&version=16766).
+
+## About GeoServer 2.19
+
+Additional information on GeoServer 2.19 series:
+
+ * [GeoServer repository transition to main branch](main-branch.html)
+ * Release notes ([2.19-RC](https://osgeo-org.atlassian.net/secure/ReleaseNote.jspa?projectId=10000&version=16766))
+
diff --git a/_posts/2021-03-04-main-branch.md b/_posts/2021-03-04-main-branch.md
new file mode 100644
index 000000000..574dd22ef
--- /dev/null
+++ b/_posts/2021-03-04-main-branch.md
@@ -0,0 +1,28 @@
+---
+author: Jody Garnett
+date: 2021-03-04
+layout: post
+title: GeoServer repository transition to main branch
+categories:
+- Announcements
+---
+
+The GeoServer project is changing our default branch to ``main``.
+
+*The casual use of the words "master" and "slave" in computer software is an unnecessary reference to a painful human experience that continue to impact society.*
+
+The change is part of an industry shift made possible by the [git](https://sfconservancy.org/news/2020/jun/23/gitbranchname/), [bitbucket](https://bitbucket.org/blog/moving-away-from-master-as-the-default-name-for-branches-in-git), [github](https://github.com/github/renaming) and [gitlab](https://gitlab.com/gitlab-org/gitlab/-/issues/221164) projects. The git command line, repository implementations, now support ``main`` as default branch setting.
+
+To update your local repository:
+
+```bash
+git branch -m master main
+git fetch upstream
+git branch -u upstream/main main
+```
+
+To [configure your local ``git`` tool](https://github.blog/2020-07-27-highlights-from-git-2-28/#introducing-init-defaultbranch) so that new repositories are created with a ``main`` branch:
+
+```bash
+git config --global init.defaultBranch main
+```
diff --git a/download/index.html b/download/index.html
index 2274178ca..9dd1c16ff 100644
--- a/download/index.html
+++ b/download/index.html
@@ -205,15 +205,9 @@ GeoServer {{site.dev_branch}} Development
Nightly builds for the {{site.dev_branch}} branch can be found here.
-
-
-
+
diff --git a/img/posts/2.19-RC/geonode_download_1.png b/img/posts/2.19-RC/geonode_download_1.png
new file mode 100644
index 000000000..f2ed51fe1
Binary files /dev/null and b/img/posts/2.19-RC/geonode_download_1.png differ
diff --git a/img/posts/2.19-RC/geonode_download_2.png b/img/posts/2.19-RC/geonode_download_2.png
new file mode 100644
index 000000000..2f879d8e0
Binary files /dev/null and b/img/posts/2.19-RC/geonode_download_2.png differ
diff --git a/img/posts/2.19-RC/geonode_download_3.png b/img/posts/2.19-RC/geonode_download_3.png
new file mode 100644
index 000000000..c8406b243
Binary files /dev/null and b/img/posts/2.19-RC/geonode_download_3.png differ
diff --git a/img/posts/2.19-RC/geonode_download_4.png b/img/posts/2.19-RC/geonode_download_4.png
new file mode 100644
index 000000000..3d060042b
Binary files /dev/null and b/img/posts/2.19-RC/geonode_download_4.png differ
diff --git a/img/posts/2.19-RC/gwc_s3.png b/img/posts/2.19-RC/gwc_s3.png
new file mode 100644
index 000000000..15345ec6d
Binary files /dev/null and b/img/posts/2.19-RC/gwc_s3.png differ
diff --git a/img/posts/2.19-RC/mapml-gridsets.png b/img/posts/2.19-RC/mapml-gridsets.png
new file mode 100644
index 000000000..db566ad12
Binary files /dev/null and b/img/posts/2.19-RC/mapml-gridsets.png differ
diff --git a/img/posts/2.19-RC/mapml-layer-preview-list.PNG b/img/posts/2.19-RC/mapml-layer-preview-list.PNG
new file mode 100644
index 000000000..c072182ea
Binary files /dev/null and b/img/posts/2.19-RC/mapml-layer-preview-list.PNG differ
diff --git a/img/posts/2.19-RC/mapml-layers-panel.png b/img/posts/2.19-RC/mapml-layers-panel.png
new file mode 100644
index 000000000..f272305f4
Binary files /dev/null and b/img/posts/2.19-RC/mapml-layers-panel.png differ
diff --git a/img/posts/2.19-RC/mapml-preview-mashup.PNG b/img/posts/2.19-RC/mapml-preview-mashup.PNG
new file mode 100644
index 000000000..30f27b4bd
Binary files /dev/null and b/img/posts/2.19-RC/mapml-preview-mashup.PNG differ
diff --git a/img/posts/2.19-RC/param_extract_echo.png b/img/posts/2.19-RC/param_extract_echo.png
new file mode 100644
index 000000000..7e284afff
Binary files /dev/null and b/img/posts/2.19-RC/param_extract_echo.png differ
diff --git a/img/posts/2.19-RC/param_extract_expand.png b/img/posts/2.19-RC/param_extract_expand.png
new file mode 100644
index 000000000..00a0f5e7d
Binary files /dev/null and b/img/posts/2.19-RC/param_extract_expand.png differ
diff --git a/img/posts/2.19-RC/timeline-base.jpg b/img/posts/2.19-RC/timeline-base.jpg
new file mode 100644
index 000000000..39433a1bd
Binary files /dev/null and b/img/posts/2.19-RC/timeline-base.jpg differ
diff --git a/img/posts/2.19-RC/timeline-histogram.jpg b/img/posts/2.19-RC/timeline-histogram.jpg
new file mode 100644
index 000000000..b3a80006d
Binary files /dev/null and b/img/posts/2.19-RC/timeline-histogram.jpg differ
diff --git a/index.html b/index.html
index fc6184922..e2f2f73b6 100644
--- a/index.html
+++ b/index.html
@@ -93,7 +93,7 @@ Development
diff --git a/release/2.19-RC/index.html b/release/2.19-RC/index.html
new file mode 100644
index 000000000..a1c3968a2
--- /dev/null
+++ b/release/2.19-RC/index.html
@@ -0,0 +1,8 @@
+---
+layout: release_219
+title: GeoServer
+version: 2.19-RC
+jira_version: 16798
+release_date: March 3rd, 2021
+announce: announcements/2021/03/04/geoserver-2-19-RC-released.html
+---
diff --git a/release/2.19.x/index.html b/release/2.19.x/index.html
new file mode 100644
index 000000000..c9c9aae80
--- /dev/null
+++ b/release/2.19.x/index.html
@@ -0,0 +1,10 @@
+---
+layout: nightly
+title: GeoServer
+version: 2.19.x
+jira_version: 16814
+branch_name: 2.19.x
+docs: latest
+branch: 2.19.x
+series: '2.19'
+---
diff --git a/release/dev/index.html b/release/dev/index.html
index e2e21e09e..a1c3968a2 100644
--- a/release/dev/index.html
+++ b/release/dev/index.html
@@ -1,8 +1,8 @@
---
-layout: release_218
+layout: release_219
title: GeoServer
-version: 2.18-RC
-jira_version: 16783
-release_date: September 8th, 2020
-announce: 2020/09/08/geoserver-2-18-rc-released/
+version: 2.19-RC
+jira_version: 16798
+release_date: March 3rd, 2021
+announce: announcements/2021/03/04/geoserver-2-19-RC-released.html
---
diff --git a/release/main/index.html b/release/main/index.html
new file mode 100644
index 000000000..cb40c7fe7
--- /dev/null
+++ b/release/main/index.html
@@ -0,0 +1,10 @@
+---
+layout: nightly
+title: GeoServer
+version:
+jira_version: 16815
+branch_name: main
+docs: latest
+branch: main
+series: '2.20'
+---
diff --git a/release/master/index.html b/release/master/index.html
deleted file mode 100644
index 679c6eb27..000000000
--- a/release/master/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
----
-layout: nightly
-title: GeoServer
-version:
-jira_version: 16798
-branch_name: master
-docs: latest
-branch: master
-series: '2.19'
----