Implement dynamic request configurations

.github/workflows/CI.yml

@@ -8,25 +8,31 @@ on:
     - master
     # using filter pattern: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet
     - '[cC][0-9][0-9][0-9]-+**' # c123 or c123-something for custom branch
-    - '[0-9][0-9][0-9][0-9].[0-9][0-9].xx' # stable brances. E.g. 2021.01.xx
+    - '[0-9][0-9][0-9][0-9].[0-9][0-9].xx' # stable branches. E.g. 2021.01.xx
+    - '[geonode]-[0-9].[0-9].x' # stable branches for GeoNode. E.g. geonode-4.4.x
   pull_request:
+    types: [opened, synchronize, reopened]
     branches:
     - master
     # using filter pattern: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet
     - '[cC][0-9][0-9][0-9]-+**' # c123 or c123-something for custom branch
-    - '[0-9][0-9][0-9][0-9].[0-9][0-9].xx' # stable brances. E.g. 2021.01.xx
-
+    - '[0-9][0-9][0-9][0-9].[0-9][0-9].xx' # stable branches. E.g. 2021.01.xx
+    - '[geonode]-[0-9].[0-9].x' # stable branches for GeoNode. E.g. geonode-4.4.x
 jobs:
   test-front-end:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: ['20.x', '22.x', '24.x']
+      fail-fast: false
     steps:
       - name: "checking out"
         uses: actions/checkout@v3
 
       - name: "setting up npm"
         uses: actions/setup-node@v3
         with:
-            node-version: '20.x'
+            node-version: ${{ matrix.node-version }}
 
       ############
       # CACHING
@@ -61,13 +67,19 @@ jobs:
       - name: Unit Tests
         run: npm test -- --reporters mocha,coverage,coveralls
 
-      - name: Coveralls
+      - name: Send coverage to Coveralls (parallel)
         uses: coverallsapp/github-action@master
         with:
            github-token: ${{ secrets.GITHUB_TOKEN }}
+           parallel: true
+           flag-name: run-${{ join(matrix.*, '-') }}
 
   test-back-end:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java-version: ['11.x', '17.x', '21.x']
+      fail-fast: false
     steps:
       - name: "checking out"
         uses: actions/checkout@v3
@@ -79,7 +91,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '11.x'
+          java-version: ${{ matrix.java-version }}
 
       - name: "cache maven dependencies"
         uses: actions/cache@v4
@@ -92,9 +104,28 @@ jobs:
       # JAVA CHECKS
       ##############
       - name: java
-        run: mvn --batch-mode --update-snapshots verify -Pprintingbundle,binary
+        run: mvn --batch-mode --update-snapshots verify -Pprintingbundle
   build:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: ['20.x', '22.x', '24.x']
+        java-version: ['11.x', '17.x', '21.x']
+        # Reduce the combinations to reduce the total number of jobs
+        exclude:
+          - node-version: '20.x'
+            java-version: '17.x'
+          - node-version: '20.x'
+            java-version: '21.x'
+          - node-version: '22.x'
+            java-version: '11.x'
+          - node-version: '22.x'
+            java-version: '21.x'
+          - node-version: '24.x'
+            java-version: '11.x'
+          - node-version: '24.x'
+            java-version: '17.x'
+      fail-fast: false
     steps:
       - name: "checking out"
         uses: actions/checkout@v3
@@ -106,12 +137,12 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '11.x'
+          java-version: ${{ matrix.java-version }}
 
       - name: "setting up npm"
         uses: actions/setup-node@v2
         with:
-            node-version: '20.x'
+            node-version: ${{ matrix.node-version }}
 
       ############
       # CACHING
@@ -151,7 +182,12 @@ jobs:
         run: mvn --batch-mode --update-snapshots verify
   build-publish:
     runs-on: ubuntu-latest
-    if:  ${{ github.event_name == 'push' && github.repository == 'geosolutions-it/MapStore2' }}
+    if: |
+      github.event_name == 'push' &&
+      github.repository == 'geosolutions-it/MapStore2' &&
+      (
+        github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/20')
+      )
     needs: [test-front-end, test-back-end, build]
     steps:
       - name: "checking out"
@@ -180,13 +216,14 @@ jobs:
         # Here it deploys only java modules and root, needed for MS project builds.
         # Product, binary modules are to big to be hosted on the repository in snapshots, so they are skipped
         run: |
+          # Setup SSH keys for SFTP
+          mkdir -p ~/.ssh && chmod 700 ~/.ssh
+          # add geo-solutions.it to known hosts to avoid prompts
+          ssh-keyscan -H maven.geo-solutions.it >> ~/.ssh/known_hosts
           # deploys java packages
           mvn clean install deploy -f java/pom.xml
           # deploys also the root module, needed for dependencies
           mvn deploy --non-recursive
         env:
           MAVEN_USERNAME: ${{ secrets.GS_MAVEN_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.GS_MAVEN_PASSWORD }}
-
-
-

.github/workflows/backport.yml

@@ -0,0 +1,51 @@
+name: Backport merged pull request
+on:
+  pull_request_target:
+    types: [closed, labeled]
+permissions:
+  contents: write # so it can comment
+  pull-requests: write # so it can create pull requests
+jobs:
+  backport:
+    name: Backport pull request
+    runs-on: ubuntu-latest
+    # Don't run on closed unmerged pull requests
+    if: >
+      github.event.pull_request.merged
+      && (
+        github.event.action == 'closed'
+        || (
+          github.event.action == 'labeled'
+          && contains(github.event.label.name, 'backport')
+        )
+      )
+    steps:
+      - uses: actions/checkout@v4
+        with:
+            # Token for git actions, e.g. git push see https://github.com/korthout/backport-action/issues/379
+            token: ${{ secrets.BACKPORT_ACTION_PAT }}
+      - name: Get issues
+        id: get-issues
+        uses: mondeja/pr-linked-issues-action@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.BACKPORT_ACTION_PAT }}
+      - name: Create backport pull requests
+        uses: korthout/backport-action@v3
+        with:
+          # Token for git actions, see https://github.com/korthout/backport-action/issues/379
+          github_token: ${{ secrets.BACKPORT_ACTION_PAT }}
+          auto_merge_method: squash
+          copy_assignees: true
+          copy_milestone: true
+          copy_requested_reviewers: true
+          add_labels: Backport
+          pull_description: |-
+            # Description
+            Backport of #${pull_number} to `${target_branch}`.
+
+            Fixes #${{ steps.get-issues.outputs.issues }}
+
+          experimental: >
+            {
+              "conflict_resolution": "draft_commit_conflicts"
+            }

.github/workflows/build.yml

@@ -6,6 +6,7 @@ on:
     # using filter pattern: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#filter-pattern-cheat-sheet
     - '[cC][0-9][0-9][0-9]-+**' # c123 or c123-something for custom branch
     - '[0-9][0-9][0-9][0-9].[0-9][0-9].xx' # stable brances. E.g. 2021.01.xx
+    - '[geonode]-[0-9].[0-9].x' # stable branches for GeoNode. E.g. geonode-4.4.x
 
 jobs:
   build-publish:

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [2025.02.00](https://github.com/geosolutions-it/MapStore2/tree/v2025.02.00) (2025-12-10)
+
+- **[Full Changelog](https://github.com/geosolutions-it/MapStore2/compare/v2025.01.02...v2025.02.00)**
+- **[Implemented enhancements](https://github.com/geosolutions-it/MapStore2/issues?q=is%3Aissue+milestone%3A%222025.02.00%22+is%3Aclosed+label%3Aenhancement)**
+- **[Fixed bugs](https://github.com/geosolutions-it/MapStore2/issues?q=is%3Aissue+milestone%3A%222025.02.00%22+is%3Aclosed+label%3Abug)**
+- **[Closed issues](https://github.com/geosolutions-it/MapStore2/issues?q=is%3Aissue+milestone%3A%222025.02.00%22+is%3Aclosed)**
+
 ## [2025.01.02](https://github.com/geosolutions-it/MapStore2/tree/v2025.01.02) (2025-10-8)
 
 - **[Full Changelog](https://github.com/geosolutions-it/MapStore2/compare/v2025.01.01...v2025.01.02)**

Dockerfile

@@ -1,12 +1,51 @@
-FROM tomcat:9-jdk11 AS mother
+FROM tomcat:9-jdk17 AS mother
 LABEL maintainer="Alessandro Parma<alessandro.parma@geosolutionsgroup.com>"
-ARG MAPSTORE_WEBAPP_SRC="https://github.com/geosolutions-it/MapStore2/releases/latest/download/mapstore.war"
-ADD "${MAPSTORE_WEBAPP_SRC}" "/mapstore/"
-
-COPY ./docker/* /mapstore/docker/
+ARG MAPSTORE_WEBAPP_SRC=""
+WORKDIR /tmp/build-context
+COPY . .
+RUN set -eux; \
+    mkdir -p /mapstore; \
+    WAR_SRC="${MAPSTORE_WEBAPP_SRC}"; \
+    if [ -z "${WAR_SRC}" ]; then \
+        for candidate in \
+            "./product/target/mapstore.war" \
+            "./web/target/mapstore.war"; do \
+            if [ -f "${candidate}" ]; then \
+                WAR_SRC="${candidate}"; \
+                break; \
+            fi; \
+        done; \
+    fi; \
+    if [ -z "${WAR_SRC}" ]; then \
+        echo "Unable to locate mapstore.war. Build the project or pass MAPSTORE_WEBAPP_SRC." >&2; \
+        exit 1; \
+    fi; \
+    case "${WAR_SRC}" in \
+        http://*|https://*) \
+            apt-get update; \
+            DEBIAN_FRONTEND=noninteractive apt-get install --yes curl ca-certificates; \
+            curl -fsSL "${WAR_SRC}" -o /mapstore/mapstore.war; \
+            apt-get purge --yes --auto-remove curl ca-certificates; \
+            rm -rf /var/lib/apt/lists/*; \
+            ;; \
+        /*|./*) \
+            cp "${WAR_SRC}" /mapstore/mapstore.war; \
+            ;; \
+        *) \
+            if [ -f "${WAR_SRC}" ]; then \
+                cp "${WAR_SRC}" /mapstore/mapstore.war; \
+            else \
+                echo "Invalid MAPSTORE_WEBAPP_SRC value: ${WAR_SRC}" >&2; \
+                exit 1; \
+            fi; \
+            ;; \
+    esac; \
+
+    mkdir -p /mapstore/docker; \
+    cp -r ./docker/. /mapstore/docker/
 WORKDIR /mapstore
 
-FROM tomcat:9-jdk11
+FROM tomcat:9-jdk17
 ARG UID=1001
 ARG GID=1001
 ARG UNAME=tomcat
@@ -28,7 +67,6 @@ COPY --from=mother "/mapstore/mapstore.war" "${MAPSTORE_WEBAPP_DST}/mapstore.war
 COPY --from=mother "/mapstore/docker" "${CATALINA_BASE}/docker/"
 
 COPY binary/tomcat/conf/server.xml "${CATALINA_BASE}/conf/"
-RUN sed -i -e 's/8082/8080/g' ${CATALINA_BASE}/conf/server.xml
 
 RUN mkdir -p ${DATA_DIR}
 

README.md

@@ -13,6 +13,8 @@ MapStore's architecture is designed for modularity and extensibility, allowing d
 
 For more information check the <a href="https://docs.mapstore.geosolutionsgroup.com/en/latest/" target="_blank">MapStore documentation!</a>
 
+Also check out the MapStore project entry page available online at [mapstore.io](https://mapstore.io/)
+
 ## Documentation
 
 You can find more documentation about how to build, install or develop with MapStore on the <a href="https://docs.mapstore.geosolutionsgroup.com/en/latest/" target="_blank">documentation site</a>.
@@ -30,7 +32,7 @@ We have the following instances:
 3. a STABLE instance, which can be accessed <a href="https://mapstore.geosolutionsgroup.com/" target="_blank">here</a>, that gets deployed on demand after each release.
 
 As a user you need to be aware of STABLE and DEV, QA is used internally before a release; for 1 Week it will diverge from STABLE as it is actually anticipating the next stable.
-So, if you want to test latest features use DEV, if you are not that brave use STABLE. You might forget that QA exists unless you are parte of the developers team.
+So, if you want to test latest features use DEV, if you are not that brave use STABLE. You might forget that QA exists unless you are part of the developers team.
 
 ## Download
 
@@ -59,6 +61,20 @@ Then you can access MapStore using the following URL:
 
 Use the default credentials (admin / admin) to login and start creating your maps!
 
+### * Build your own image
+
+If you need to customize MapStore (e.g., use your own build or custom plugins), you can build an image using the provided Dockerfile instead of relying on the prebuilt image.
+
+The Dockerfile supports the build-time argument `MAPSTORE_WEBAPP_SRC`, which specifies either the URL or the local path of an already-built WAR file to include in the image.
+
+```shell
+docker build \
+  --build-arg MAPSTORE_WEBAPP_SRC=<YOUR_WAR_FILE> \
+  -t <YOUR_IMAGE_TAG> .
+```
+
+If this argument is not provided, the build will automatically detect the WAR file from either `./product/target` (standard MapStore) or `./web/target` (custom MapStore), depending on the project structure.
+
 ### * Run the Mapstore with PostGIS through docker-compose in the local environment
 
 - To test a different release of MapStore, you should change the `MAPSTORE_WEBAPP_SRC` build argument in the docker-compose file.

binary/bin-war/pom.xml

@@ -3,12 +3,12 @@
     <parent>
         <groupId>it.geosolutions.mapstore</groupId>
         <artifactId>mapstore-binary</artifactId>
-        <version>1.10-SNAPSHOT</version>
+        <version>1.11-SNAPSHOT</version>
     </parent>
     <groupId>it.geosolutions.mapstore</groupId>
     <artifactId>mapstore-bin-war</artifactId>
     <packaging>war</packaging>
-    <version>1.10-SNAPSHOT</version>
+    <version>1.11-SNAPSHOT</version>
     <name>MapStore 2 Release Module WAR</name>
     <description>Creates the war for the binary package, adding customization (e.g. h2 database)</description>
     <url>http://www.geo-solutions.it</url>
@@ -65,6 +65,29 @@
                     </webResources>
                 </configuration>
             </plugin>
+            <!-- artifact assembly moved here so it runs after WAR packaging -->
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.1</version>
+                <configuration>
+                    <descriptors>
+                        <descriptor>../bin.xml</descriptor>
+                    </descriptors>
+                    <finalName>mapstore2-${binary.number}</finalName>
+                    <!-- place ZIP in the binary module target directory (bin-war -> ../../target) -->
+                    <outputDirectory>${project.build.directory}/../../target</outputDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <inherited>false</inherited>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>