GH actions update due to new project (geosolutions-it#10036)

fkellner · Mar 7, 2024 · 6ba87df · 6ba87df
1 parent 54841a9
commit 6ba87df
Show file tree

Hide file tree

Showing 12 changed files with 66 additions and 106 deletions.
diff --git 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

diff --git 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 }}

diff --git 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 }}"

diff --git 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)))

diff --git a/project/standard/templates/backend/pom.xml b/project/standard/templates/backend/pom.xml
diff --git a/project/standard/templates/backend/src/main/java/placeholder b/project/standard/templates/backend/src/main/java/placeholder
diff --git a/project/standard/templates/backend/src/main/resources/placeholder b/project/standard/templates/backend/src/main/resources/placeholder
diff --git a/project/standard/templates/backend/src/test/java/placeholder b/project/standard/templates/backend/src/test/java/placeholder
diff --git a/project/standard/templates/backend/src/test/resources/placeholder b/project/standard/templates/backend/src/test/resources/placeholder
diff --git a/project/standard/templates/build.sh b/project/standard/templates/build.sh
diff --git a/project/standard/templates/pom.xml b/project/standard/templates/pom.xml
@@ -18,7 +18,6 @@
 
     <modules>
         <module>web</module>
-        <module>MapStore2/java/services</module>
     </modules>
 
 </project>
diff --git a/project/standard/templates/web/pom.xml b/project/standard/templates/web/pom.xml
@@ -18,7 +18,14 @@
     <mapstore-services.version>1.8-SNAPSHOT</mapstore-services.version>
     <geostore-webapp.version>2.1-SNAPSHOT</geostore-webapp.version>
     <http_proxy.version>1.6-SNAPSHOT</http_proxy.version>
-    <print-lib.version>1.4-SNAPSHOT</print-lib.version>
+    <print-lib.version>2.4-SNAPSHOT</print-lib.version>
+    <httpclient.version>4.5.13</httpclient.version>
+    <junit.version>4.13.1</junit.version>
+    <mockito-all.version>1.9.5</mockito-all.version>
+    <javax.servlet-api.version>3.0.1</javax.servlet-api.version>
+    <ehcache-web.version>2.0.4</ehcache-web.version>
+    <commons-pool.version>1.5.4</commons-pool.version>
+    <jaxws-api.version>2.3.1</jaxws-api.version>
   </properties>
 
   <dependencies>
@@ -115,7 +122,7 @@
                         <goal>copy-resources</goal>
                     </goals>
                     <configuration>
-                        <outputDirectory>${basedir}/target/__PROJECTNAME__</outputDirectory>
+                        <outputDirectory>${basedir}/target/mapstore</outputDirectory>
                         <encoding>UTF-8</encoding>
                         <resources>
                             <resource>
@@ -138,7 +145,7 @@
                         <goal>copy-resources</goal>
                     </goals>
                     <configuration>
-                        <outputDirectory>${basedir}/target/__PROJECTNAME__</outputDirectory>
+                        <outputDirectory>${basedir}/target/mapstore</outputDirectory>
                         <encoding>UTF-8</encoding>
                         <resources>
                             <resource>
@@ -161,7 +168,7 @@
                         <goal>copy-resources</goal>
                     </goals>
                     <configuration>
-                        <outputDirectory>${basedir}/target/__PROJECTNAME__</outputDirectory>
+                        <outputDirectory>${basedir}/target/mapstore</outputDirectory>
                         <encoding>UTF-8</encoding>
                         <resources>
                             <resource>
@@ -184,7 +191,7 @@
                         <goal>copy-resources</goal>
                     </goals>
                     <configuration>
-                        <outputDirectory>${basedir}/target/__PROJECTNAME__</outputDirectory>
+                        <outputDirectory>${basedir}/target/mapstore</outputDirectory>
                         <encoding>UTF-8</encoding>
                         <resources>
                             <resource>
@@ -207,7 +214,7 @@
                         <goal>copy-resources</goal>
                     </goals>
                     <configuration>
-                        <outputDirectory>${basedir}/target/__PROJECTNAME__</outputDirectory>
+                        <outputDirectory>${basedir}/target/mapstore</outputDirectory>
                         <encoding>UTF-8</encoding>
                         <resources>
                             <resource>
@@ -230,7 +237,7 @@
                         <goal>copy-resources</goal>
                     </goals>
                     <configuration>
-                        <outputDirectory>${basedir}/target/__PROJECTNAME__</outputDirectory>
+                        <outputDirectory>${basedir}/target/mapstore</outputDirectory>
                         <encoding>UTF-8</encoding>
                         <resources>
                             <resource>
@@ -259,7 +266,7 @@
                         <goal>copy-resources</goal>
                     </goals>
                     <configuration>
-                        <outputDirectory>${basedir}/target/__PROJECTNAME__/dist</outputDirectory>
+                        <outputDirectory>${basedir}/target/mapstore/dist</outputDirectory>
                         <encoding>UTF-8</encoding>
                         <resources>
                             <resource>
@@ -275,7 +282,7 @@
                         <goal>copy-resources</goal>
                     </goals>
                     <configuration>
-                        <outputDirectory>${basedir}/target/__PROJECTNAME__/assets</outputDirectory>
+                        <outputDirectory>${basedir}/target/mapstore/assets</outputDirectory>
                         <encoding>UTF-8</encoding>
                         <resources>
                             <resource>
@@ -291,7 +298,7 @@
                         <goal>copy-resources</goal>
                     </goals>
                     <configuration>
-                        <outputDirectory>${basedir}/target/__PROJECTNAME__/</outputDirectory>
+                        <outputDirectory>${basedir}/target/mapstore/</outputDirectory>
                         <encoding>UTF-8</encoding>
                         <resources>
                             <resource>
@@ -310,7 +317,7 @@
                         <goal>copy-resources</goal>
                     </goals>
                     <configuration>
-                        <outputDirectory>${basedir}/target/__PROJECTNAME__/printing</outputDirectory>
+                        <outputDirectory>${basedir}/target/mapstore/printing</outputDirectory>
                         <encoding>UTF-8</encoding>
                         <resources>
                             <resource>
@@ -329,7 +336,7 @@
                         <goal>copy-resources</goal>
                     </goals>
                     <configuration>
-                        <outputDirectory>${basedir}/target/__PROJECTNAME__/MapStore2/web/client</outputDirectory>
+                        <outputDirectory>${basedir}/target/mapstore/MapStore2/web/client</outputDirectory>
                         <encoding>UTF-8</encoding>
                         <resources>
                             <resource>
@@ -348,7 +355,7 @@
                         <goal>copy-resources</goal>
                     </goals>
                     <configuration>
-                        <outputDirectory>${basedir}/target/__PROJECTNAME__/MapStore2/web/client/configs</outputDirectory>
+                        <outputDirectory>${basedir}/target/mapstore/MapStore2/web/client/configs</outputDirectory>
                         <encoding>UTF-8</encoding>
                         <resources>
                             <resource>
@@ -457,7 +464,7 @@
                                 <configuration>
                                 <overWrite>true</overWrite>
                                 <sourceFile>src/printing/applicationContext-print.xml</sourceFile>
-                                <destinationFile>target/__PROJECTNAME__/WEB-INF/classes/applicationContext-print.xml</destinationFile>
+                                <destinationFile>target/mapstore/WEB-INF/classes/applicationContext-print.xml</destinationFile>
                                 </configuration>
                             </execution>
                         </executions>
@@ -469,7 +476,43 @@
                     <dependency>
                         <groupId>org.apache.httpcomponents</groupId>
                         <artifactId>httpclient</artifactId>
-                        <version>4.5.13</version>
+                        <version>${httpclient.version}</version>
+                    </dependency>
+                    <!-- JUnit -->
+                    <dependency>
+                        <groupId>junit</groupId>
+                        <artifactId>junit</artifactId>
+                        <scope>test</scope>
+                        <version>${junit.version}</version>
+                    </dependency>
+                    <!--  mockito -->
+                    <dependency>
+                        <groupId>org.mockito</groupId>
+                        <artifactId>mockito-all</artifactId>
+                        <version>${mockito-all.version}</version>
+                    </dependency>
+                    <!-- servlet -->
+                    <dependency>
+                        <groupId>javax.servlet</groupId>
+                        <artifactId>javax.servlet-api</artifactId>
+                        <version>${javax.servlet-api.version}</version>
+                    </dependency>
+                    <!-- gzip compression filter -->
+                    <dependency>
+                        <groupId>net.sf.ehcache</groupId>
+                        <artifactId>ehcache-web</artifactId>
+                        <version>${ehcache-web.version}</version>
+                    </dependency>
+                    <!-- misc -->
+                    <dependency>
+                        <groupId>commons-pool</groupId>
+                        <artifactId>commons-pool</artifactId>
+                        <version>${commons-pool.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>javax.xml.ws</groupId>
+                        <artifactId>jaxws-api</artifactId>
+                        <version>${jaxws-api.version}</version>
                     </dependency>
                 </dependencies>
             </dependencyManagement>