Skip to content

Commit 806d8e5

Browse files
committed
Merge tag 'v2025.01.00' into staging-rt-v2025
2 parents 7cab49f + 3b1b891 commit 806d8e5

1,266 files changed

Lines changed: 81221 additions & 80900 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
web/client/test-resources/* -text
2+
*.json text eol=lf

.github/ISSUE_TEMPLATE/release_steps.md

Lines changed: 35 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ This steps have to be followed always when preparing a new release.
1616
- [ ] for `geostore`, check if [here](https://maven.geo-solutions.it/it/geosolutions/geostore/geostore-webapp/) is present the version specified. Release procedure is specified in the [Readme.md](https://github.com/geosolutions-it/geostore) file of the project.
1717
- [ ] for `http_proxy`, check if [here](https://maven.geo-solutions.it/proxy/http_proxy/) is present the version specified. Release procedure is specified in the [Readme.md](https://github.com/geosolutions-it/http-proxy) file of the project.
1818
- [ ] for `mapfish-print` check if [here](https://maven.geo-solutions.it/proxy/http_proxy/) is present the version specified. Release procedure is specified in the [Readme.md](https://github.com/geosolutions-it/mapfish-print) file of the project.
19+
- [ ] Check if dependencies of MapStore libraries and geostore libraries are the same (compare `src/pom.xml` in geostore e `pom.xml` in MapStore).
20+
- [ ] Check if dependencies of the **template projects** are aligned
21+
- [ ] `project/standard/templates/pom.xml` are aligned as the ones in `pom.xml` of MapStore
22+
- [ ] `project/standard/templates/web/pom.xml` are aligned as the ones in `product/pom.xml` of MapStore.
1923

2024
## New stable branch creation
2125

@@ -27,32 +31,37 @@ This steps have to be followed always when preparing a new release.
2731
- [ ] MapStore branch name to use: `YYYY.XX.xx`
2832
- [ ] use the default value for the other parameters
2933
- [ ] Wait for the process to complete. At the end:
30-
- A Pull request will be created to the master
31-
- A new branch named `YYYY.XX.xx` with fixed versions
34+
- A Pull request will be created to the master
35+
- A new branch named `YYYY.XX.xx` with fixed versions
3236
- [ ] Merge the incoming PR created by the workflow
33-
- [ ] Create on [ReadTheDocs](https://readthedocs.org/projects/mapstore/) project the version build for `YYYY.XX.xx` (click on "Versions" and activate the version of the branch)
37+
- [ ] Create on [ReadTheDocs](https://app.readthedocs.org/projects/mapstore/) project the version build for `YYYY.XX.xx` (click on "Versions" and activate the version of the branch)
3438
- [ ] Run the [`Cut Release Branch`](https://github.com/geosolutions-it/MapStoreExtension/actions/workflows/cut_release_branch.yml) workflow on MapStoreExtension project, indicating:
35-
- [ ] Use workflow from branch `master`
36-
- [ ] MapStore branch name to use: `YYYY.XX.xx`
37-
- [ ] main branch `master` (default)
39+
- [ ] Use workflow from branch `master`
40+
- [ ] MapStore branch name to use: `YYYY.XX.xx`
41+
- [ ] main branch `master` (default)
3842
- [ ] Update the [QA build](http://build.geosolutionsgroup.com/view/MapStore/job/MapStore/view/MapStore%20QA/job/MapStore2-QA-Build/) to point to the branch created (YYYY.XX.xx)
3943

4044
## Before the Release
4145

4246
- [ ] Check `pom.xml` dependencies are all in fixed stable versions ( no `-SNAPSHOT` usage release). If not, You use the action [`Update dependencies versions`](https://github.com/geosolutions-it/MapStore2/actions/workflows/update_dependencies_versions.yml) to fix them, setting:
43-
- [ ] the branch to `YYYY.XX.xx`
44-
- [ ] the of geostore, http_proxy and mapfish-print versions accordingly with the [MapStore release calendar](https://github.com/geosolutions-it/MapStore2/wiki/MapStore-Release-Calendars)
45-
- [ ] Check that [MapStoreExtension](https://github.com/geosolutions-it/MapStoreExtension) repository is aligned and working
47+
- [ ] the branch to `YYYY.XX.xx`
48+
- [ ] the of geostore, http_proxy and mapfish-print versions accordingly with the [MapStore release calendar](https://github.com/geosolutions-it/MapStore2/wiki/MapStore-Release-Calendars)
49+
- [ ] Merge the PR created after the action avove has been finshed
50+
- [ ] Check that [MapStoreExtension](https://github.com/geosolutions-it/MapStoreExtension) repository is aligned and working.
51+
- [ ] Run the [Submodule Update](https://github.com/geosolutions-it/MapStoreExtension/actions/workflows/submodules_update.yml) of [MapStoreExtension](https://github.com/geosolutions-it/MapStoreExtension) to generate the `SampleExtension.zip` to use for testing.
52+
- [ ] Use workflow from `YYYY.XX.xx` branch
53+
- [ ] Wait for completition
54+
- [ ] Download the `Artifacts.zip` that contains `SampleExtension.zip` from the execution of the `checks` action on the branch `YYYY.XX.xx`. This can be used for tests.
4655
- [ ] Test on QA [https://qa-mapstore.geosolutionsgroup.com/mapstore/](https://qa-mapstore.geosolutionsgroup.com/mapstore/)
4756
- [ ] Test **everything**, not only the new features
4857
- [ ] Test the creation of a standard project starting in from the stable branch and with the internal backend, so:
49-
- [ ] `node ./createProject.js` and insert the entries (for the rest simply press enter:
50-
- **project name**: `release_project_test`
51-
- **base branch**: insert the release branch (e.g. `YYYY.XX.xx`)
52-
- **project folder** insert `../test_release_<release_number>` )
53-
- [ ] `cd ../test_release_<release_number>`
54-
- [ ] `npm install`
55-
- [ ] `npm run start:app`, then check that an empty homepage loads correctly
58+
- [ ] `node ./createProject.js` and insert the entries (for the rest simply press enter:
59+
- **project name**: `release_project_test`
60+
- **base branch**: insert the release branch (e.g. `YYYY.XX.xx`)
61+
- **project folder** insert `../test_release_<release_number>` )
62+
- [ ] `cd ../test_release_<release_number>`
63+
- [ ] `npm install`
64+
- [ ] `npm run start:app`, then check that an empty homepage loads correctly
5665
- [ ] Test [Binary](http://build.geosolutionsgroup.com/view/MapStore/job/MapStore/view/MapStore%20QA/job/MapStore2-QA-Build/) (take the mapstore2-<RELEASE_BRANCH>-qa-bin.zip, from latest build)
5766

5867
## Prepare Release
@@ -64,8 +73,8 @@ This steps have to be followed always when preparing a new release.
6473
- version to fix for the java module, accordingly with [release calendar](https://github.com/geosolutions-it/MapStore2/wiki/MapStore-Release-Calendars) (e.g. `1.7.0`)
6574
- use the default value for the other parameters
6675
- [ ] Wait for the process to complete. At the end:
67-
- a new commit will be added to the release branch tagged as `vYYYY.XX.mm`. This commit will contain the changelog and the updated version of the java modules.
68-
- a pull request will be created on master with the changelog updates
76+
- a new commit will be added to the release branch tagged as `vYYYY.XX.mm`. This commit will contain the changelog and the updated version of the java modules.
77+
- a pull request will be created on master with the changelog updates
6978
- [ ] Merge the incoming PR created by the workflow for updating changelog on Master
7079
- [ ] Run [`Submodules Update`](https://github.com/geosolutions-it/MapStoreExtension/actions/workflows/submodules_update.yml) on MapStoreExtension:
7180
- Branch `YYYY.XX.xx`
@@ -82,7 +91,7 @@ This steps have to be followed always when preparing a new release.
8291
- [ ] After "MapStore2-Stable-Build" finished, Launch [MapStore2-Stable-Deploy](http://build.geosolutionsgroup.com/view/MapStore/job/MapStore/view/MapStore%20Stable/job/MapStore2-Stable-Deploy/) to install the latest stable version on official demo.
8392
- `branch`: `vYYYY.XX.mm` (the version tag name, e.g. v2024.01.01)
8493
- `TAG_NAME`: `${branch}-stable` (tag of the docker hub image, previously build)
85-
- [ ] Test the change has been applied, login on https://mapstore.geosolutionsgroup.com and verify that the layers from `gs-stable` are visible without errors (typically authentication errors that was caused by the wrong auth-key).
94+
- [ ] Test the change has been applied, login on <https://mapstore.geosolutionsgroup.com> and verify that the layers from `gs-stable` are visible without errors (typically authentication errors that was caused by the wrong auth-key).
8695

8796
## Create and Publish MapStoreExtension release
8897

@@ -116,14 +125,17 @@ When the processes are finished, the release is ready to be published on github
116125

117126
## Update ReadTheDocs
118127

119-
- [ ] create on [ReadTheDocs](https://readthedocs.org/projects/mapstore/) project the version build for `vYYYY.XX.mm` (click on "Versions" and activate the version of the tag, created when release was published)
120-
- [ ] Update `Default version` to point the release version in the `Advanced Settings` menu of the [ReadTheDocs](https://readthedocs.org/dashboard/mapstore/advanced/) admin panel
128+
- [ ] create on [ReadTheDocs](https://app.readthedocs.org/dashboard/mapstore/version/create/) project the version build for `vYYYY.XX.mm` (search for the tag, check the `active` toggle and click on update verson )
129+
- [ ] Update `Default version` to point the new tag (`vYYYY.XX.mm`) in read the [ReadTheDocs Settings](https://app.readthedocs.org/dashboard/mapstore/edit/) panel and click on save.
121130

122131
## Finalize Release
123132

124133
- [ ] Run the [`Post Release`](https://github.com/geosolutions-it/MapStore2/actions/workflows/post_release.yml) workflow on github with the following parameters:
125-
- Use workflow from branch `YYYY.XX.xx` (the release branch)
126-
- Version of Java Packages to restore accordingly with [release calendar](https://github.com/geosolutions-it/MapStore2/wiki/MapStore-Release-Calendars) with `-SNAPSHOT` E.g. `1.7-SNAPSHOT`
134+
- Use workflow from branch `YYYY.XX.xx` (the release branch)
135+
- Version of Java Packages to restore accordingly with [release calendar](https://github.com/geosolutions-it/MapStore2/wiki/MapStore-Release-Calendars) with `-SNAPSHOT` E.g. `1.7-SNAPSHOT`
136+
- [ ] Use the action [`Update dependencies versions`](https://github.com/geosolutions-it/MapStore2/actions/workflows/update_dependencies_versions.yml) to restore the `-SNAPSHOT` version of GeoStore, setting:
137+
- [ ] the branch to `YYYY.XX.xx`
138+
- [ ] the of geostore, http_proxy and mapfish-print versions accordingly with the [MapStore release calendar](https://github.com/geosolutions-it/MapStore2/wiki/MapStore-Release-Calendars) and use `-SNAPSHOT` version of geostore.
127139
- [ ] Write to the mailing list about the current release news and the next release major changes
128140
- [ ] Optional - prepare a PR for updating release procedure, if needed
129141
- [ ] Close this issue

.github/workflows/CI.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
# CACHING
3333
##########
3434
- name: "cache node modules"
35-
uses: actions/cache@v3
35+
uses: actions/cache@v4
3636
env:
3737
cache-name: cache-node-modules
3838
with:
@@ -82,7 +82,7 @@ jobs:
8282
java-version: '11.x'
8383

8484
- name: "cache maven dependencies"
85-
uses: actions/cache@v3
85+
uses: actions/cache@v4
8686
with:
8787
path: ~/.m2/repository
8888
key: mapstore-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -117,7 +117,7 @@ jobs:
117117
# CACHING
118118
##########
119119
- name: "cache node modules"
120-
uses: actions/cache@v3
120+
uses: actions/cache@v4
121121
env:
122122
cache-name: cache-node-modules
123123
with:
@@ -129,7 +129,7 @@ jobs:
129129
${{ runner.os }}-
130130
131131
- name: "cache maven dependencies"
132-
uses: actions/cache@v3
132+
uses: actions/cache@v4
133133
with:
134134
path: ~/.m2/repository
135135
key: mapstore-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
# CACHING
2727
##########
2828
- name: "cache node modules"
29-
uses: actions/cache@v3
29+
uses: actions/cache@v4
3030
env:
3131
cache-name: cache-node-modules
3232
with:
@@ -37,7 +37,7 @@ jobs:
3737
${{ runner.os }}-build-
3838
${{ runner.os }}-
3939
- name: "cache maven dependencies"
40-
uses: actions/cache@v3
40+
uses: actions/cache@v4
4141
with:
4242
path: ~/.m2/repository
4343
key: mapstore-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -53,7 +53,7 @@ jobs:
5353
############
5454
# Publish
5555
##########
56-
- uses: actions/upload-artifact@v3.1.0
56+
- uses: actions/upload-artifact@v4
5757
with:
5858
name: MapStore-Artifacts${{ github.sha }}
5959
path: |

.github/workflows/create_release.yml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
# CACHING
4444
##########
4545
- name: "cache node modules"
46-
uses: actions/cache@v1
46+
uses: actions/cache@v4
4747
env:
4848
cache-name: cache-node-modules
4949
with:
@@ -54,7 +54,7 @@ jobs:
5454
${{ runner.os }}-build-
5555
${{ runner.os }}-
5656
- name: "cache maven dependencies"
57-
uses: actions/cache@v1
57+
uses: actions/cache@v4
5858
with:
5959
path: ~/.m2/repository
6060
key: mapstore-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -64,34 +64,36 @@ jobs:
6464
id: "build"
6565
run: "./build.sh ${{ github.event.inputs.version }} binary,printingbundle"
6666
- name: "Upload war"
67-
uses: actions/upload-artifact@v3
67+
uses: actions/upload-artifact@v4
6868
with:
69-
name: war
69+
name: release-war
7070
path: product/target/mapstore.war
7171
- name: "Upload binary"
72-
uses: actions/upload-artifact@v3
72+
uses: actions/upload-artifact@v4
7373
with:
74-
name: binary
74+
name: release-binary
7575
path: "binary/target/mapstore2-${{ github.event.inputs.version }}-bin.zip"
7676
- name: "Upload printing"
77-
uses: actions/upload-artifact@v3
77+
uses: actions/upload-artifact@v4
7878
with:
79-
name: printing
79+
name: release-printing
8080
path: "java/printing/target/mapstore-printing.zip"
8181
release:
8282
runs-on: ubuntu-latest
8383
needs: build
8484
steps:
8585
- name: "Download war"
86-
uses: actions/download-artifact@v3
86+
uses: actions/download-artifact@v4.1.7
8787
with:
8888
path: artifacts/
89+
pattern: release-*
90+
merge-multiple: true
8991
- name: Display structure of downloaded files
9092
run: ls -R
9193
working-directory: artifacts
9294
- name: Get current date
9395
id: date
94-
run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
96+
run: echo "name=date::$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
9597
- name: create_release
9698
id: create_release
9799
uses: actions/create-release@v1
@@ -127,7 +129,7 @@ jobs:
127129
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
128130
with:
129131
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
130-
asset_path: artifacts/war/mapstore.war
132+
asset_path: artifacts/mapstore.war
131133
asset_name: mapstore.war
132134
asset_content_type: application/zip
133135
- name: Upload Release binary
@@ -137,7 +139,7 @@ jobs:
137139
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
138140
with:
139141
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
140-
asset_path: "artifacts/binary/mapstore2-${{github.event.inputs.version}}-bin.zip"
142+
asset_path: "artifacts/mapstore2-${{github.event.inputs.version}}-bin.zip"
141143
asset_name: "mapstore2-${{github.event.inputs.version}}-bin.zip"
142144
asset_content_type: application/zip
143145
- name: Upload Release printing
@@ -147,6 +149,6 @@ jobs:
147149
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
148150
with:
149151
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
150-
asset_path: artifacts/printing/mapstore-printing.zip
152+
asset_path: artifacts/mapstore-printing.zip
151153
asset_name: mapstore-printing.zip
152154
asset_content_type: application/zip

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,5 @@ debug.log
2727
site
2828
.github/
2929
.DS_Store
30+
venv
31+
__pycache__

.prettierignore

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Prettier Ignore File
2+
3+
## contains broken JSON for tests
4+
5+
test-resources
6+
7+
## dist and build folders
8+
9+
dist
10+
target
11+
site
12+
docs/
13+
build
14+
docma-template
15+
node_modules
16+
coverage
17+
18+
## IDEs configs and Java projects
19+
20+
.vscode
21+
java/
22+
23+
## Actually prettier is used only for JSON files, so other files are ignored
24+
25+
*.js
26+
*.jsx
27+
*.md
28+
*.less
29+
*.css
30+
*.html
31+
*.yml
32+
*.hbs
33+
*.yaml

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Change Log
22

3+
## [2025.01.00](https://github.com/geosolutions-it/MapStore2/tree/v2025.01.00) (2025-6-18)
4+
5+
- **[Full Changelog](https://github.com/geosolutions-it/MapStore2/compare/v2024.02.02...v2025.01.00)**
6+
- **[Implemented enhancements](https://github.com/geosolutions-it/MapStore2/issues?q=is%3Aissue+milestone%3A%222025.01.00%22+is%3Aclosed+label%3Aenhancement)**
7+
- **[Fixed bugs](https://github.com/geosolutions-it/MapStore2/issues?q=is%3Aissue+milestone%3A%222025.01.00%22+is%3Aclosed+label%3Abug)**
8+
- **[Closed issues](https://github.com/geosolutions-it/MapStore2/issues?q=is%3Aissue+milestone%3A%222025.01.00%22+is%3Aclosed)**
9+
310
## [2024.02.02](https://github.com/geosolutions-it/MapStore2/tree/v2024.02.02) (2024-12-11)
411

512
- **[Full Changelog](https://github.com/geosolutions-it/MapStore2/compare/v2024.02.01...v2024.02.02)**

0 commit comments

Comments
 (0)