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.

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

Update tomcat jars to version greater than 9.0.75 #7713

Merged
merged 1 commit into from
Oct 19, 2023

Conversation

mbussolotto
Copy link
Member

@mbussolotto mbussolotto commented Oct 19, 2023

What does this PR change?

According to https://ant.apache.org/ivy/history/2.5.2/ivyfile/dependency.html update tomcat jars to version greater than 9.0.75 (but lower than 10.0.0).

GUI diff

No difference.

  • DONE

Documentation

  • No documentation needed

  • DONE

Test coverage

  • No tests

  • DONE

Links

  • DONE

Changelogs

Make sure the changelogs entries you are adding are compliant with https://github.com/uyuni-project/uyuni/wiki/Contributing#changelogs and https://github.com/uyuni-project/uyuni/wiki/Contributing#uyuni-projectuyuni-repository

If you don't need a changelog check, please mark this checkbox:

  • No changelog needed

If you uncheck the checkbox after the PR is created, you will need to re-run changelog_test (see below)

Re-run a test

If you need to re-run a test, please mark the related checkbox, it will be unchecked automatically once it has re-run:

  • Re-run test "changelog_test"
  • Re-run test "backend_unittests_pgsql"
  • Re-run test "java_pgsql_tests"
  • Re-run test "schema_migration_test_pgsql"
  • Re-run test "susemanager_unittests"
  • Re-run test "javascript_lint"
  • Re-run test "spacecmd_unittests"

@github-actions
Copy link
Contributor

Suggested tests to cover this Pull Request
  • minssh_salt_install_package
  • min_deblike_monitoring
  • srv_power_management
  • min_salt_mgrcompat_state
  • srv_sync_channels
  • proxy_cobbler_pxeboot
  • allcli_software_channels_dependencies
  • srv_content_lifecycle
  • minkvm_guests
  • srv_task_status_engine
  • srv_patches_page
  • srv_logfile
  • srv_rename_hostname
  • srv_docker_cve_audit
  • srv_enable_sync_products
  • srv_create_repository
  • srv_cobbler_profile
  • min_empty_system_profiles
  • min_ansible_control_node
  • srv_reportdb
  • min_retracted_patches
  • srv_add_rocky8_repositories
  • srv_organization_credentials
  • allcli_reboot
  • min_bootstrap_ssh_key
  • srv_manage_activationkey
  • min_deblike_salt_install_package
  • buildhost_docker_build_image
  • srv_custom_system_info
  • minssh_bootstrap_api
  • srv_advanced_search
  • srv_cobbler_distro
  • srv_scc_user_credentials
  • min_rhlike_ssh
  • allcli_update_activationkeys
  • srv_datepicker
  • min_salt_openscap_audit
  • srv_change_password
  • srv_user_preferences
  • srv_cobbler_sync
  • min_salt_install_with_staging
  • allcli_config_channel
  • min_salt_software_states
  • srv_channels_add
  • min_bootstrap_api
  • min_bootstrap_reactivation
  • min_rhlike_monitoring
  • srv_distro_cobbler
  • min_rhlike_salt_install_package_and_patch
  • min_config_state_channel_api
  • buildhost_osimage_build_image
  • srv_group_union_intersection
  • allcli_action_chain
  • min_salt_pkgset_beacon
  • buildhost_bootstrap
  • proxy_branch_network
  • srv_virtual_host_manager
  • min_cve_id_new_syntax
  • allcli_sanity
  • min_deblike_ssh
  • srv_check_channels_page
  • srv_dist_channel_mapping
  • min_config_state_channel
  • srv_change_task_schedule
  • min_salt_minions_page
  • srv_delete_channel_with_tool
  • srv_notifications
  • min_deblike_remote_command
  • sle_ssh_minion
  • srv_wait_for_reposync
  • srv_salt
  • min_custom_pkg_download_endpoint
  • allcli_software_channels
  • srv_maintenance_windows
  • sle_minion
  • srv_cobbler_buildiso
  • minssh_move_from_and_to_proxy
  • srv_users
  • srv_user_api
  • srv_push_package
  • min_docker_api
  • srv_check_sync_source_packages
  • srv_sync_products
  • allcli_system_group
  • srv_handle_config_channels_with_ISS_v2
  • srv_delete_channel_from_ui
  • srv_restart
  • srv_power_management_redfish
  • srv_user_configuration_salt_states
  • min_bootstrap_negative
  • min_activationkey
  • srv_clone_channel_npn
  • min_rhlike_salt
  • min_salt_formulas_advanced
  • srv_handle_software_channels_with_ISS_v2
  • srv_manage_channels_page
  • srv_mainpage
  • min_salt_migration
  • min_recurring_action
  • proxy_as_pod_basic_tests
  • min_salt_minion_details
  • min_salt_lock_packages
  • min_deblike_openscap_audit
  • srv_menu_filter
  • srv_check_reposync
  • min_check_patches_install
  • min_virthost
  • srv_power_management_api
  • min_move_from_and_to_proxy
  • min_project_lotus
  • min_config_state_channel_subscriptions
  • srv_payg_ssh_connection
  • min_timezone
  • min_salt_user_states
  • srv_activationkey_api
  • minssh_ansible_control_node
  • min_deblike_salt
  • srv_docker
  • buildhost_docker_auth_registry
  • srv_monitoring
  • min_deblike_salt_install_with_staging
  • min_cve_audit
  • min_rhlike_remote_command
  • srv_channel_api
  • proxy_retail_pxeboot_and_mass_import
  • min_bootstrap_script
  • min_rhlike_openscap_audit
  • srv_docker_advanced_content_management
  • srv_salt_download_endpoint
  • proxy_register_as_minion_with_script
  • min_salt_install_package
  • srv_menu
  • min_monitoring
  • min_change_software_channel
  • min_action_chain
  • srv_osimage
  • srv_first_settings
  • minssh_action_chain
  • srv_create_activationkey
  • min_salt_formulas
  • allcli_overview_systems_details
  • srv_disable_local_repos_off
  • min_ssh_tunnel

@mbussolotto mbussolotto marked this pull request as ready for review October 19, 2023 09:55
@mbussolotto mbussolotto requested a review from a team as a code owner October 19, 2023 09:55
@mbussolotto mbussolotto requested review from mackdk, deneb-alpha and meaksh and removed request for a team October 19, 2023 09:55
@mbussolotto mbussolotto requested a review from a team October 19, 2023 10:50
Copy link
Member

@meaksh meaksh left a comment

Choose a reason for hiding this comment

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

Hmmm, it seems the version intervals are not working properly (at least using apache-ivy-2.5.2-2.1.noarch):

[ivy-retrieve] 		::::::::::::::::::::::::::::::::::::::::::::::
[ivy-retrieve] 		::          UNRESOLVED DEPENDENCIES         ::
[ivy-retrieve] 		::::::::::::::::::::::::::::::::::::::::::::::
[ivy-retrieve] 		:: suse#jasper;[9.0.75,10.0.0[: not found
[ivy-retrieve] 		:: suse#jasper-el;[9.0.75,10.0.0[: not found
[ivy-retrieve] 		:: suse#tomcat-el-3.0-api;[9.0.75,10.0.0[: not found
[ivy-retrieve] 		:: suse#tomcat-jsp-2.3-api;[9.0.75,10.0.0[: not found
[ivy-retrieve] 		:: suse#tomcat-juli;[9.0.75,10.0.0[: not found
[ivy-retrieve] 		:: suse#tomcat-servlet-4.0-api;[9.0.75,10.0.0[: not found
[ivy-retrieve] 		::::::::::::::::::::::::::::::::::::::::::::::
[ivy-retrieve] 

Not sure if I'm missing something..

@mbussolotto
Copy link
Member Author

Thanks for testing it, it was working in my case...I l have another look

Copy link
Member

@meaksh meaksh left a comment

Choose a reason for hiding this comment

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

Woops, sorry! This is actually working fine!

I was using org="suse" instead of org="manager-43" when testing this on my Manager-4.3 branch.

Sorry for the noise. LGTM 👍

Copy link
Contributor

@deneb-alpha deneb-alpha left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@mbussolotto mbussolotto merged commit 77c90b6 into uyuni-project:master Oct 19, 2023
12 of 15 checks passed
r-richardson pushed a commit to r-richardson/uyuni that referenced this pull request Oct 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants