Skip to content

Aligned module versions to 1.4-SNAPSHOT#8152

Merged
offtherailz merged 3 commits intogeosolutions-it:masterfrom
offtherailz:snapshot_align
May 11, 2022
Merged

Aligned module versions to 1.4-SNAPSHOT#8152
offtherailz merged 3 commits intogeosolutions-it:masterfrom
offtherailz:snapshot_align

Conversation

@offtherailz
Copy link
Copy Markdown
Member

@offtherailz offtherailz commented Apr 29, 2022

Description

Aligned versions of mapstore modules.
Please check if the PR fulfills these requirements

What kind of change does this PR introduce? (check one with "x", remove the others)

  • Bugfix
  • Feature
  • Code style update (formatting, local variables)
  • Refactoring (no functional changes, no api changes)
  • Build related changes
  • CI related changes
  • Other... Please describe:

Issue

What is the current behavior?

#

What is the new behavior?

Breaking change

Does this PR introduce a breaking change? (check one with "x", remove the other)

  • Yes, and I documented them in migration notes
  • No

Other useful information

@offtherailz offtherailz self-assigned this Apr 29, 2022
@offtherailz offtherailz requested a review from tdipisa April 29, 2022 15:58
@offtherailz offtherailz marked this pull request as ready for review April 29, 2022 15:58
@offtherailz offtherailz marked this pull request as draft April 29, 2022 15:59
@offtherailz
Copy link
Copy Markdown
Member Author

offtherailz commented Apr 29, 2022

I've noticed that printing modules are not updated.

In release procedure we have :

mvn versions:set -DnewVersion=1.4-SNAPSHOT -DgenerateBackupPoms=false

I noticed that this doesn't update the modules included only in some profiles, printing and so on. Anyway adding the profiles the things doesn't change.

I had to run this to update all modules.

mvn release:update-versions -DdevelopmentVersion=1.4-SNAPSHOT -Pprinting,printingbundle,release

But doing this I noticed that somewhere we use project properties and it replaces the properties.

@taba90 what it could be the better approach to keep module versions in sync? What are the strategies used for other java projects we handle.

@offtherailz offtherailz requested a review from taba90 April 29, 2022 16:18
@offtherailz offtherailz marked this pull request as ready for review May 9, 2022 15:57
@tdipisa
Copy link
Copy Markdown
Member

tdipisa commented May 9, 2022

@taba90 can you double check this PR with a review^

Copy link
Copy Markdown
Contributor

@taba90 taba90 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. Just a minor observation that is not mandatory to merge the pr.
Regarding the question from @offtherailz I'm don't know actually a way to have the version set to the printing module in a simpler way.
Other java projects doesn't have all this modules with a root pom as it is the case of MapStore2, but instead they've a single root pom module and all the others as children of it.
Will add this as something to keep in mind for the incoming refactoring of mapstore dependecies and modules management.

Comment thread release/bin-war/pom.xml
<groupId>it.geosolutions.mapstore</groupId>
<artifactId>mapstore-bin-war</artifactId>
<packaging>war</packaging>
<version>${mapstore2.version}</version>
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

then I guess that this property should go away https://github.com/geosolutions-it/MapStore2/blob/master/java/web/pom.xml#L13 so we avoid keeping it and creating confusion

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I was wrong. mapstore2.version is passed as variable to the build script to generate the binary and set the version (e.g. 2022.01.01). So I should keep the property and the version here.

Comment thread release/pom.xml Outdated
Comment thread release/bin-war/pom.xml Outdated
@offtherailz
Copy link
Copy Markdown
Member Author

offtherailz commented May 11, 2022

@taba90 I re-checked. The two with the mapstore.version need to be set as they are, in order to obtain the proper version in the release package :
e.g.

./build.sh XXXX release # XXXX can be 2022.01.01, for instance. 
[...]
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary:
[INFO] 
[INFO] MapStore 2 - Backend Services 1.4-SNAPSHOT ......... SUCCESS [  3.492 s]
[INFO] MapStore 2 - WAR 1.4-SNAPSHOT ...................... SUCCESS [  4.958 s]
[INFO] MapStore 2 1.4-SNAPSHOT ............................ SUCCESS [  0.005 s]
[INFO] MapStore Product Web Application 1.4-SNAPSHOT ...... SUCCESS [  7.529 s]
[INFO] MapStore 2 Release Module WAR XXXX ................. SUCCESS [  6.844 s]
[INFO] MapStore 2 Release Module XXXX ..................... SUCCESS [ 33.853 s]
[INFO] MapStore Root 1.4-SNAPSHOT ......................... SUCCESS [  0.015 s]
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time:  56.914 s
[INFO] Finished at: 2022-05-11T10:13:25+02:00

# creates --> release/target/mapstore2-XXXX-bin.zip 

Unify the version numbers in the future may simplify also this stuff.

@offtherailz offtherailz merged commit f9741bc into geosolutions-it:master May 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants