Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH actions update due to new project #10036

Merged
merged 6 commits into from
Mar 7, 2024
Merged

GH actions update due to new project #10036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2217d3d
Update cut_major_branch.yml
offtherailz Mar 6, 2024
840e050
Update release steps
offtherailz Mar 6, 2024
7ab7fce
Fix on update script
offtherailz Mar 6, 2024
dc69ada
Fixed project pom
offtherailz Mar 6, 2024
f588435
update doc on workflows
offtherailz Mar 6, 2024
09616b2
fixed project pom
offtherailz Mar 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/release_steps.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 1 addition & 20 deletions .github/workflows/cut_major_branch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/update_dependencies_versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
4 changes: 3 additions & 1 deletion docs/developer-guide/release.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down
64 changes: 0 additions & 64 deletions project/standard/templates/backend/pom.xml
View file
Open in desktop

This file was deleted.

Empty file removed project/standard/templates/backend/src/main/java/placeholder
View file
Open in desktop
Empty file.
Empty file removed project/standard/templates/backend/src/main/resources/placeholder
View file
Open in desktop
Empty file.
Empty file removed project/standard/templates/backend/src/test/java/placeholder
View file
Open in desktop
Empty file.
Empty file removed project/standard/templates/backend/src/test/resources/placeholder
View file
Open in desktop
Empty file.
Empty file modified project/standard/templates/build.sh
100644 → 100755
View file
Open in desktop
Empty file.
1 change: 0 additions & 1 deletion project/standard/templates/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

<modules>
<module>web</module>
<module>MapStore2/java/services</module>
</modules>

</project>
73 changes: 58 additions & 15 deletions project/standard/templates/web/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down
Loading