update JOSS to NM 6.0.0

.github/ISSUE_TEMPLATE/bug-report-or-usage-issue.md

@@ -22,10 +22,6 @@ Steps to reproduce the behavior:
 3. Scroll down to '....'
 4. See error
 
-**Geoserver log**
-
-Attach geoserver log located in **data_dir\logs\geoserver.log**
-
 **Expected behavior**
 A clear and concise description of what you expected to happen.
 

.github/workflows/CI.yml

@@ -1,13 +1,21 @@
 name: CI
 
-on: [ push, pull_request, workflow_dispatch ]
+on:
+  push:
+    branches: [main]
+  pull_request:
+  workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
-  build:
+  build_linux:
     runs-on: ubuntu-latest
     services:
       postgres:
-        image: postgis/postgis:16-3.4
+        image: imresamu/postgis:17-3.5
         env:
           # must specify password for PG Docker container image, see: https://registry.hub.docker.com/_/postgres?tab=description&page=1&name=10
           POSTGRES_USER: noisemodelling
@@ -18,6 +26,12 @@ jobs:
         # needed because the postgres container does not provide a healthcheck
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
     steps:
+      - name: Cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            $HOME/.m2/
+          key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
       # Checkout the source code of the project
       - name: Checkout
         uses: actions/checkout@v4
@@ -33,57 +47,68 @@ jobs:
           gpg-private-key: ${{ secrets.GPG_SECRET_KEY }}
           gpg-passphrase: MAVEN_GPG_PASSPHRASE
       - name: Building
-        run: mvn test install javadoc:test-javadoc javadoc:jar -B
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
-      - name: Build and test WPS with Gradle
-        run:  ./gradlew build --info --stacktrace
-        working-directory: ./wps_scripts
-      - name: Maven Deploy
-        env:
-          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
-          MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-        if: ${{ (env.MAVEN_USERNAME != null) && (github.ref == 'refs/heads/main') }}
-        run: mvn clean deploy -B
-      - name: Clean gradle cache
-        run: rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
-      - name: Restore gradle.properties
+        run: mvn test install javadoc:jar package -B
         env:
-          MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
-          MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
-        if: ${{ (env.MAVEN_USERNAME != null) && (github.ref == 'refs/heads/main') }}
-        shell: bash
+          POSTGRES_HOST: localhost
+          POSTGRES_PORT: 5432
+          POSTGRES_DB: noisemodelling_db
+          POSTGRES_USER: noisemodelling
+          POSTGRES_PASSWORD: noisemodelling
+      - name: Unzip production artifacts
+        run: |
+          # 1. Unzip into a temporary directory
+          unzip -q noisemodelling-scripts/target/*.zip -d tmp_extract
+
+          # 2. Create target directory
+          mkdir NoiseModelling
+
+          # 3. Move contents from the subfolder to the target
+          # The asterisk-slash-asterisk moves everything inside the first subfolder
+          mv tmp_extract/*/* NoiseModelling/
+
+          # 4. Cleanup
+          rm -rf tmp_extract
+      - name: Integration test, use ScriptRunner with H2GIS
         run: |
-          mkdir -p ~/.gradle/
-          echo "GRADLE_USER_HOME=${HOME}/.gradle" >> $GITHUB_ENV
-          echo "ossrhUsername=${MAVEN_USERNAME}" >> ~/.gradle/gradle.properties
-          echo "ossrhPassword=${MAVEN_PASSWORD}" >> ~/.gradle/gradle.properties
-          echo "signing.gnupg.passphrase=${MAVEN_GPG_PASSPHRASE}" >> ~/.gradle/gradle.properties
-      - name: Deploy WPS
+          bin/ScriptRunner -w /tmp/h2gis_ws -s get_started_tutorial_complex.groovy
+        working-directory: NoiseModelling
+      - name: Integration test, use ScriptRunner with PostGIS
+        run: |
+          bin/ScriptRunner -w /tmp/postgis_ws -s get_started_tutorial_complex.groovy --host localhost --user noisemodelling --password noisemodelling --port 5432 --database noisemodelling_db
+        working-directory: NoiseModelling
+      - name: Maven Deploy snapshot
         env:
           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
           MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
         if: ${{ (env.MAVEN_USERNAME != null) && (github.ref == 'refs/heads/main') }}
-        run: ./gradlew publish -d
-        working-directory: ./wps_scripts
-      - name: Cache
-        uses: actions/cache@v4
-        with:
-          path: |
-            $HOME/.m2/
-            $HOME/.gradle/caches/
-            $HOME/.gradle/wrapper/
-          key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
-
-      #Production of the archive
-      - name: Unzip production artifacts
-        run: ./gradlew assembleDist && unzip build/distributions/*.zip -d NoiseModelling_without_gui
-        working-directory: ./wps_scripts
-      - name: Archive production artifacts
+        run: mvn clean -DskipTests deploy -B
+      - name: Generate Sanitized Artifact Name
+        id: sanitize
+        run: |
+          # Determine the raw value (Ref name if not default branch, otherwise SHA)
+          if [ "${{ github.ref_name }}" != "${{ github.event.repository.default_branch }}" ]; then
+          RAW_VAL="${{ github.ref_name }}"
+          else
+          RAW_VAL="${{ github.sha }}"
+          fi
+
+          # Use sed to perform replacements:
+          # 1. / and \ become _
+          # 2. : is removed
+          # 3. * becomes x
+          CLEAN_VAL=$(echo "$RAW_VAL" | sed 's/[\/\\]/_/g; s/://g; s/\*/x/g')
+
+          # Set it as an environment variable for the next step
+          echo "ARTIFACT_NAME=NoiseModelling-$CLEAN_VAL" >> $GITHUB_ENV
+      - name: Upload distribution file
         uses: actions/upload-artifact@v4
         with:
-          name: NoiseModelling_without_gui
-          path: wps_scripts/NoiseModelling_without_gui/
+          name: ${{ env.ARTIFACT_NAME }}
+          path: NoiseModelling/
+  build_windows:
+    uses: ./.github/workflows/build_windows.yml
+    with:
+      git_ref: ${{ github.ref }}
+
+

.github/workflows/CI_Release.yml

@@ -3,16 +3,22 @@ name: CI release
 on:
   workflow_dispatch:
     inputs:
-      nextVersion:
-        required: false
-        description: "Next version (optional)"
+      releaseVersion:
+        description: 'Release version (e.g., 2.0.0)'
+        required: true
+      developmentVersion:
+        description: 'Next development version (e.g., 2.1.0-SNAPSHOT)'
+        required: true
 
 jobs:
-  build:
+  prepare_release:
+    outputs:
+      tag_name: v${{ github.event.inputs.release_version }}
     name: Release and next iteration
     runs-on: ubuntu-latest
     permissions:
       contents: write
+      pull-requests: write
     steps:
       # Checkout the source code of the project
       - name: Checkout
@@ -28,71 +34,110 @@ jobs:
           server-password: MAVEN_PASSWORD
           gpg-private-key: ${{ secrets.GPG_SECRET_KEY }}
           gpg-passphrase: MAVEN_GPG_PASSPHRASE
-
+      - name: Setup Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: '3.11'
       # Configure git user in order to sign release with OrbisGIS user.
       - name: Configure Git User
         run: |
           git config user.email "contact@noise-planet.org"
           git config user.name Noise-Planet
-
-      # Test build
-      - name: Build test
-        run: mvn -ntp clean validate package test javadoc:test-javadoc javadoc:jar
-
-      - name: Install xmlstarlet (if needed)
-        run: sudo apt-get update && sudo apt-get install -y libxml-xpath-perl
-      - name: Update version in build.gradle
+      - name: Configure Git
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+      - name: Create Release Branch
         run: |
-          bash update_gradle_version.sh
-          git commit -am "Update groovy wps version"
-        working-directory: wps_scripts
-      # Create the release :
-      #   - move from Snapshot version to Release
-      #   - commit and tag release
-      #   - move to next Snapshot
-      #   - upload release to maven repo
-      - name: Release
+          git checkout -b release/v${{ github.event.inputs.releaseVersion }}
+      - name: Prepare and perform Release
+        # -DpushChanges=false ensures Maven doesn't try to push to main automatically
         run: |
-          VERSION=${{ github.event.inputs.nextVersion }}
-          mvn \
-            -ntp \
-            --batch-mode \
-            -Dmaven.test.skip=true \
-            release:prepare release:perform \
-            -Dusername=$GITHUB_ACTOR -Dpassword=$GITHUB_TOKEN ${VERSION:+"-DdevelopmentVersion="$VERSION"-SNAPSHOT"}
+          mvn -B release:prepare \
+            -DreleaseVersion=${{ github.event.inputs.releaseVersion }} \
+            -DdevelopmentVersion=${{ github.event.inputs.developmentVersion }} \
+            -DpushChanges=false \
+            -P-use-snapshots \
+            -Darguments="-P-use-snapshots"
+
+          # 2. Temporarily switch to the tag to deploy the Release version
+          git checkout v${{ github.event.inputs.releaseVersion }}
+
+          # 3. Deploy the Release version (the code currently checked out)
+          # We use -DskipTests because prepare already ran them.
+          mvn clean javadoc:jar deploy -P-use-snapshots -DskipTests -B
+
+          # 4. Switch back to the release branch to continue the workflow
+          git checkout release/v${{ github.event.inputs.releaseVersion }}
         env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
           MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+      - name: Push Branch and Tag
+        run: |
+          # Push the commits (Release and Next Snapshot) to the temporary branch
+          git push origin release/v${{ github.event.inputs.releaseVersion }}
+          # Push the tag (Maven creates this locally)
+          git push origin v${{ github.event.inputs.releaseVersion }}
+      - name: Create Pull Request to Main
+        run: |
+          gh pr create \
+            --title "Release v${{ github.event.inputs.releaseVersion }}" \
+            --body "This PR updates the version to ${{ github.event.inputs.releaseVersion }} and prepares the next development cycle ${{ github.event.inputs.developmentVersion }}." \
+            --base main \
+            --head release/v${{ github.event.inputs.releaseVersion }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      # Export the last git tag into env.
-      - name: Export env values
-        run: echo "GIT_TAG=$(git describe --tags `git rev-list --tags --max-count=1`)" >> $GITHUB_ENV
-      # Make the Github release from the last created tag. Write in its body the content of the changelog file.
-      - name: Make Github release
-        uses: ncipollo/release-action@v1
+  build_windows_exe:
+    needs: prepare_release
+    uses: ./.github/workflows/build_windows.yml
+    with:
+      git_ref: v${{ github.event.inputs.releaseVersion }}
+      use_snapshots: false
+      run_unit_tests: false
+  build_macos_dmg:
+    needs: prepare_release
+    uses: ./.github/workflows/build_macos.yml
+    with:
+      git_ref: v${{ github.event.inputs.releaseVersion }}
+      use_snapshots: false
+  upload_release:
+    needs: [prepare_release, build_windows_exe, build_macos_dmg]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
         with:
-          tag: ${{ env.GIT_TAG }}
-          release: ${{ env.GIT_TAG }}
-          bodyFile: "README.md"
-          draft: false
-          prerelease: false
-          artifacts: "wps_scripts/build/distributions/scriptrunner.zip"
-
-      # If the version change is a major or minor, create a branch from the previous tag for future revisions.
-      - name: Branch fork
+          fetch-depth: 0 # Necessary to see tags and branches
+      - name: Build Zip Artifact
+        # Since we are already on the release-ready state locally,
+        # we can just package the webserver
         run: |
-          GIT_TAG="${GIT_TAG:1}"
-          CUR_TAG="$( mvn help:evaluate -Dexpression=project.version  | sed -n -e '/^\[.*\]/ !{ /^[0-9]/ { p; q } }' | cut -d- -f1)"
-          SPLIT0=(${GIT_TAG//./ })
-          SPLIT1=(${CUR_TAG//./ })
-          if [ "${SPLIT0[0]}" = "${SPLIT1[0]}" ] && [ "${SPLIT0[1]}" = "${SPLIT1[1]}" ]; then
-            echo "Revision change"
-          else
-            echo "Minor or Major change"
-            BRANCH="${SPLIT0[0]}.${SPLIT0[1]}.X"
-            git checkout -b "$BRANCH" "v${GIT_TAG}"
-            mvn versions:set -DnewVersion="${SPLIT0[0]}.${SPLIT0[1]}.$((${SPLIT0[2]}+1))-SNAPSHOT"
-            git commit -a -m "Set next version."
-            git push -u origin "$BRANCH"
-          fi
+          # Checkout the release tag to be sure we build the exact release code
+          git checkout v${{ github.event.inputs.releaseVersion }}
+          mvn clean package -DskipTests -P-use-snapshots
+      - name: Download windows Artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: windows-installer
+          path: release-artifacts
+      - name: Download macOS Artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ needs.build_macos_dmg.outputs.installer_name }}
+          path: release-artifacts
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: v${{ github.event.inputs.releaseVersion }}
+          name: Release ${{ github.event.inputs.releaseVersion }}
+          files: |
+            noisemodelling-scripts/target/NoiseModelling_${{ github.event.inputs.releaseVersion }}.zip
+            release-artifacts/${{ needs.build_windows_exe.outputs.installer_name }}
+            release-artifacts/${{ needs.build_macos_dmg.outputs.installer_name }}
+          generate_release_notes: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+