From 2217d3d056a5b119f74ff328efbc8be0fe584dcd Mon Sep 17 00:00:00 2001 From: Lorenzo Natali Date: Wed, 6 Mar 2024 14:11:42 +0100 Subject: [PATCH 1/6] Update cut_major_branch.yml --- .github/workflows/cut_major_branch.yml | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/.github/workflows/cut_major_branch.yml b/.github/workflows/cut_major_branch.yml index 28c15b96bc..a7354439e2 100644 --- a/.github/workflows/cut_major_branch.yml +++ b/.github/workflows/cut_major_branch.yml @@ -5,18 +5,6 @@ on: release-branch: description: MapStore branch name to use (YYYY.MM.xx). E.g. 2024.01.xx required: true - mapfish-version: - description: Mapfish print version to use (e.g. 2.3-SNAPSHOT) - required: true - default: '2.3-SNAPSHOT' - geostore-version: - description: GeoStore version to use (e.g. 2.0.0). - required: true - default: '2.0.0' - http-proxy-version: - description: Http proxy version to use (e.g. 2.4). - required: true - default: '1.4.0' main-branch: description: main branch default: master @@ -36,15 +24,8 @@ jobs: - name: Create release branch and generate PR body id: create-branch env: - MAPFISH_GROUP: org.mapfish.print - MAPFISH_VERSION: ${{ github.event.inputs.mapfish-version }} - GEOSTORE_GROUP: it.geosolutions.geostore - GEOSTORE_VERSION: ${{ github.event.inputs.geostore-version }} - HTTP_PROXY_GROUP: proxy - HTTP_PROXY_VERSION: ${{ github.event.inputs.http-proxy-version }} - RELEASE_BRANCH: ${{ github.event.inputs.release-branch }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + RELEASE_BRANCH: ${{ github.event.inputs.release-branch }} MAIN_BRANCH: ${{ github.event.inputs.main-branch }} PR_OPTIONS: ${{ github.event.inputs.pr-options }} RUN_ID: ${{ github.run_id }} From 840e0507f7251ec7b8ae0e7f356a210eb5fb86fc Mon Sep 17 00:00:00 2001 From: Lorenzo Natali Date: Wed, 6 Mar 2024 14:20:47 +0100 Subject: [PATCH 2/6] Update release steps --- .github/ISSUE_TEMPLATE/release_steps.md | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/release_steps.md b/.github/ISSUE_TEMPLATE/release_steps.md index 66e9c86366..59f40787b4 100644 --- a/.github/ISSUE_TEMPLATE/release_steps.md +++ b/.github/ISSUE_TEMPLATE/release_steps.md @@ -25,7 +25,6 @@ This steps have to be followed always when preparing a new release. With the following Parameters: - [ ] Use workflow from branch `master` - [ ] MapStore branch name to use: `YYYY.XX.xx` - - [ ] Version of *MapFish Print*, *GeoStore* and *HTTP-Proxy* accordingly to the [MapStore release calendar](https://github.com/geosolutions-it/MapStore2/wiki/MapStore-Release-Calendars) - [ ] use the default value for the other parameters - [ ] Wait for the process to complete. At the end: - A Pull request will be created to the master From 7ab7fcedc81179d271ff384f743a36fd48f5b937 Mon Sep 17 00:00:00 2001 From: Lorenzo Natali Date: Wed, 6 Mar 2024 16:35:20 +0100 Subject: [PATCH 3/6] Fix on update script --- .github/workflows/update_dependencies_versions.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/update_dependencies_versions.yml b/.github/workflows/update_dependencies_versions.yml index 6168ef384b..b63802db6c 100644 --- a/.github/workflows/update_dependencies_versions.yml +++ b/.github/workflows/update_dependencies_versions.yml @@ -50,13 +50,13 @@ jobs: mvn versions:set-property -Dproperty=print-lib.version -DnewVersion=$MAPFISH_VERSION -DgenerateBackupPoms=false -DautoVersionSubmodules=true -Pprinting mvn versions:set-property -Dproperty=geostore-webapp.version -DnewVersion=$GEOSTORE_VERSION -DgenerateBackupPoms=false -DautoVersionSubmodules=true -Pprinting mvn versions:set-property -Dproperty=http_proxy.version -DnewVersion=$HTTP_PROXY_VERSION -DgenerateBackupPoms=false -DautoVersionSubmodules=true -Pprinting - + git add pom.xml ## Update the versions of the dependencies in the project templates POM_FILES=$(git ls-files project/standard/templates/ | grep 'pom\.xml$') for POM_FILE in $POM_FILES; do - mvn versions:set-property -Dproperty=print-lib.version -DnewVersion=$MAPFISH_VERSION -DgenerateBackupPoms=false -DautoVersionSubmodules=true -Pprinting - mvn versions:set-property -Dproperty=geostore-webapp.version -DnewVersion=$GEOSTORE_VERSION -DgenerateBackupPoms=false -DautoVersionSubmodules=true -Pprinting - mvn versions:set-property -Dproperty=http_proxy.version -DnewVersion=$HTTP_PROXY_VERSION -DgenerateBackupPoms=false -DautoVersionSubmodules=true -Pprinting + mvn versions:set-property -f $POM_FILE -Dproperty=print-lib.version -DnewVersion=$MAPFISH_VERSION -DgenerateBackupPoms=false -DautoVersionSubmodules=true -Pprinting + mvn versions:set-property -f $POM_FILE -Dproperty=geostore-webapp.version -DnewVersion=$GEOSTORE_VERSION -DgenerateBackupPoms=false -DautoVersionSubmodules=true -Pprinting + mvn versions:set-property -f $POM_FILE -Dproperty=http_proxy.version -DnewVersion=$HTTP_PROXY_VERSION -DgenerateBackupPoms=false -DautoVersionSubmodules=true -Pprinting done pr_branch_name="up_versions-${RUN_ID}" echo "Creating a PR on branch: ${pr_branch_name} for ${{ github.ref_name }}" From dc69ada41eb4146d5e3db7d9cffbf8a3b46e0315 Mon Sep 17 00:00:00 2001 From: Lorenzo Natali Date: Wed, 6 Mar 2024 17:03:28 +0100 Subject: [PATCH 4/6] Fixed project pom --- project/standard/templates/backend/pom.xml | 64 ------------------- .../backend/src/main/java/placeholder | 0 .../backend/src/main/resources/placeholder | 0 .../backend/src/test/java/placeholder | 0 .../backend/src/test/resources/placeholder | 0 project/standard/templates/pom.xml | 1 - project/standard/templates/web/pom.xml | 47 +++++++++++++- 7 files changed, 45 insertions(+), 67 deletions(-) delete mode 100644 project/standard/templates/backend/pom.xml delete mode 100644 project/standard/templates/backend/src/main/java/placeholder delete mode 100644 project/standard/templates/backend/src/main/resources/placeholder delete mode 100644 project/standard/templates/backend/src/test/java/placeholder delete mode 100644 project/standard/templates/backend/src/test/resources/placeholder diff --git a/project/standard/templates/backend/pom.xml b/project/standard/templates/backend/pom.xml deleted file mode 100644 index 0f20ee7ead..0000000000 --- a/project/standard/templates/backend/pom.xml +++ /dev/null @@ -1,64 +0,0 @@ - - 4.0.0 - - it.geosolutions.__PROJECTNAME__ - __PROJECTNAME__-root - 1.0-SNAPSHOT - - __PROJECTNAME__-backend - jar - __PROJECTDESCRIPTION__ - Backend Services - http://www.geo-solutions.it - - - UTF-8 - - - - - - - - org.springframework - spring-core - - - org.springframework - spring-context - - - - - - - org.springframework - spring-web - - - org.springframework - spring-webmvc - - - - - - org.apache.logging.log4j - log4j-core - - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-slf4j-impl - - - - junit - junit - - - - diff --git a/project/standard/templates/backend/src/main/java/placeholder b/project/standard/templates/backend/src/main/java/placeholder deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/project/standard/templates/backend/src/main/resources/placeholder b/project/standard/templates/backend/src/main/resources/placeholder deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/project/standard/templates/backend/src/test/java/placeholder b/project/standard/templates/backend/src/test/java/placeholder deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/project/standard/templates/backend/src/test/resources/placeholder b/project/standard/templates/backend/src/test/resources/placeholder deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/project/standard/templates/pom.xml b/project/standard/templates/pom.xml index fa7dcf035f..0b9cd512f6 100644 --- a/project/standard/templates/pom.xml +++ b/project/standard/templates/pom.xml @@ -18,7 +18,6 @@ web - MapStore2/java/services diff --git a/project/standard/templates/web/pom.xml b/project/standard/templates/web/pom.xml index c271139993..ee2a7243dd 100644 --- a/project/standard/templates/web/pom.xml +++ b/project/standard/templates/web/pom.xml @@ -18,7 +18,14 @@ 1.8-SNAPSHOT 2.1-SNAPSHOT 1.6-SNAPSHOT - 1.4-SNAPSHOT + 2.4-SNAPSHOT + 4.5.13 + 4.13.1 + 1.9.5 + 3.0.1 + 2.0.4 + 1.5.4 + 2.3.1 @@ -469,7 +476,43 @@ org.apache.httpcomponents httpclient - 4.5.13 + ${httpclient.version} + + + + junit + junit + test + ${junit.version} + + + + org.mockito + mockito-all + ${mockito-all.version} + + + + javax.servlet + javax.servlet-api + ${javax.servlet-api.version} + + + + net.sf.ehcache + ehcache-web + ${ehcache-web.version} + + + + commons-pool + commons-pool + ${commons-pool.version} + + + javax.xml.ws + jaxws-api + ${jaxws-api.version} From f5884358d84f2a794a75e0ac0229f6286d43dd3b Mon Sep 17 00:00:00 2001 From: Lorenzo Natali Date: Wed, 6 Mar 2024 18:51:45 +0100 Subject: [PATCH 5/6] update doc on workflows --- docs/developer-guide/release.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/developer-guide/release.md b/docs/developer-guide/release.md index cdaad2eabd..35f5b1456d 100644 --- a/docs/developer-guide/release.md +++ b/docs/developer-guide/release.md @@ -47,8 +47,10 @@ flowchart TD X --> Cut Cut[[GH Action: Cut Release Branch]] -->| create branch - fix dependencies versions PR to master with packages versions update + | Update[[GH Action: Update dependencies versions]] -->| + fix package versions for geostore, http-proxy, print lib + excluding snapshots | Fixes Fixes[Fixes...] --> Tests[Tests...] Tests --> start(((start release))) From 09616b29c6ab929d172bf4ea5f51e0c2787af7f3 Mon Sep 17 00:00:00 2001 From: Lorenzo Natali Date: Thu, 7 Mar 2024 15:44:11 +0100 Subject: [PATCH 6/6] fixed project pom --- project/standard/templates/build.sh | 0 project/standard/templates/web/pom.xml | 26 +++++++++++++------------- 2 files changed, 13 insertions(+), 13 deletions(-) mode change 100644 => 100755 project/standard/templates/build.sh diff --git a/project/standard/templates/build.sh b/project/standard/templates/build.sh old mode 100644 new mode 100755 diff --git a/project/standard/templates/web/pom.xml b/project/standard/templates/web/pom.xml index ee2a7243dd..18db2699e1 100644 --- a/project/standard/templates/web/pom.xml +++ b/project/standard/templates/web/pom.xml @@ -122,7 +122,7 @@ copy-resources - ${basedir}/target/__PROJECTNAME__ + ${basedir}/target/mapstore UTF-8 @@ -145,7 +145,7 @@ copy-resources - ${basedir}/target/__PROJECTNAME__ + ${basedir}/target/mapstore UTF-8 @@ -168,7 +168,7 @@ copy-resources - ${basedir}/target/__PROJECTNAME__ + ${basedir}/target/mapstore UTF-8 @@ -191,7 +191,7 @@ copy-resources - ${basedir}/target/__PROJECTNAME__ + ${basedir}/target/mapstore UTF-8 @@ -214,7 +214,7 @@ copy-resources - ${basedir}/target/__PROJECTNAME__ + ${basedir}/target/mapstore UTF-8 @@ -237,7 +237,7 @@ copy-resources - ${basedir}/target/__PROJECTNAME__ + ${basedir}/target/mapstore UTF-8 @@ -266,7 +266,7 @@ copy-resources - ${basedir}/target/__PROJECTNAME__/dist + ${basedir}/target/mapstore/dist UTF-8 @@ -282,7 +282,7 @@ copy-resources - ${basedir}/target/__PROJECTNAME__/assets + ${basedir}/target/mapstore/assets UTF-8 @@ -298,7 +298,7 @@ copy-resources - ${basedir}/target/__PROJECTNAME__/ + ${basedir}/target/mapstore/ UTF-8 @@ -317,7 +317,7 @@ copy-resources - ${basedir}/target/__PROJECTNAME__/printing + ${basedir}/target/mapstore/printing UTF-8 @@ -336,7 +336,7 @@ copy-resources - ${basedir}/target/__PROJECTNAME__/MapStore2/web/client + ${basedir}/target/mapstore/MapStore2/web/client UTF-8 @@ -355,7 +355,7 @@ copy-resources - ${basedir}/target/__PROJECTNAME__/MapStore2/web/client/configs + ${basedir}/target/mapstore/MapStore2/web/client/configs UTF-8 @@ -464,7 +464,7 @@ true src/printing/applicationContext-print.xml - target/__PROJECTNAME__/WEB-INF/classes/applicationContext-print.xml + target/mapstore/WEB-INF/classes/applicationContext-print.xml