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

Jump to bottom

ci: keep war/Docker image Tomcat version in sync #18899

Merged
merged 2 commits into from
Oct 28, 2024
Merged

ci: keep war/Docker image Tomcat version in sync #18899

merged 2 commits into from
Oct 28, 2024

Conversation

teleivo
Copy link
Contributor

@teleivo teleivo commented Oct 23, 2024 •
edited
Loading

We are only building/testing against one version of Tomcat on master since #18787

  • remove the Tomcat matrix remnants from the jenkins pipeline (used before fix: cors config in spring 6 #18787)
  • undo move of jib/tomcat version related properties done in chore: move dhis-web modules to root and clean up struts removal #17040 back to the dhis-web-server/pom.xml. Like any other var its best to keep its scope minimal. These properties are not used anywhere else. Having them in the root makes it complex to override and understand where the actual values are coming from in the build of the war/Docker image.
  • remove unused plugin cargo-maven2-plugin
  • keep version of our embedded tomcat and Docker base image in sync by reusing the tomcat.version property

Tests

  • ./dhis-2/run-api.sh - running embedded Tomcat
  • ./dhis-2/build-dev.sh - building and running Docker image locally
  • deployed PR using IM

@teleivo teleivo force-pushed the ci-docker-tomcat branch 3 times, most recently from f3564a2 to d7a826a Compare October 23, 2024 12:53
@teleivo teleivo added the deploy Deploy DHIS2 instance with IM. label Oct 23, 2024
@teleivo teleivo requested a review from radnov October 23, 2024 12:55
@teleivo teleivo requested a review from muilpp October 23, 2024 13:19
radnov
radnov approved these changes Oct 24, 2024
View reviewed changes
Copy link
Contributor

@radnov radnov left a comment

Choose a reason for hiding this comment

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

Nice improvement! Looks good to me. 👍

@teleivo teleivo force-pushed the ci-docker-tomcat branch 2 times, most recently from 74c0b8e to 9821e23 Compare October 28, 2024 10:56
@teleivo teleivo marked this pull request as ready for review October 28, 2024 11:28
@teleivo teleivo requested a review from a team as a code owner October 28, 2024 11:28
@teleivo teleivo requested review from enricocolasante and a team October 28, 2024 11:28
@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

@teleivo teleivo merged commit 1b0de2c into master Oct 28, 2024
15 of 16 checks passed
@teleivo teleivo deleted the ci-docker-tomcat branch October 28, 2024 12:46
This was referenced Oct 30, 2024
Merged
Merged
Merged
@radnov radnov mentioned this pull request Nov 18, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@radnov radnov radnov approved these changes

@enricocolasante enricocolasante enricocolasante approved these changes

@muilpp muilpp Awaiting requested review from muilpp

Assignees
No one assigned
Labels
deploy Deploy DHIS2 instance with IM.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@teleivo @enricocolasante @radnov