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

[AMQ-9207] Upgrade various dependencies #964

Merged
merged 1 commit into from
Feb 3, 2023
Merged

[AMQ-9207] Upgrade various dependencies #964

merged 1 commit into from
Feb 3, 2023

Conversation

mattrpav
Copy link
Contributor

@mattrpav mattrpav commented Feb 1, 2023

Dependency updates:

com.thoughtworks.xstream:xstream .................... 1.4.19 -> 1.4.20
commons-daemon:commons-daemon ......................... 1.3.2 -> 1.3.3
org.apache.ant:ant ................................ 1.10.12 -> 1.10.13
org.apache.shiro:shiro-core ......................... 1.10.1 -> 1.11.0
org.apache.shiro:shiro-spring ....................... 1.10.1 -> 1.11.0
org.codehaus.jettison:jettison ........................ 1.5.2 -> 1.5.3
regexp:regexp ............................................. 1.3 -> 1.5
org.apache.httpcomponents:httpclient ................ 4.5.13 -> 4.5.14
org.apache.httpcomponents:httpcore .................. 4.4.15 -> 4.4.16

@mattrpav mattrpav self-assigned this Feb 1, 2023
@jbonofre
Copy link
Member

jbonofre commented Feb 2, 2023

Please ping me before such kind of updates, I already had all atomic dep updates ready.

@jbonofre jbonofre self-requested a review February 2, 2023 08:00
@mattrpav
Copy link
Contributor Author

mattrpav commented Feb 2, 2023

Please ping me before such kind of updates, I already had all atomic dep updates ready.

@jbonofre sure thing, will do going forward.

FYI-- @cshannon had requested combining PRs for minor dependency updates like these, while things like jetty, jackons, spring, etc would have atomic PRs

@jbonofre
Copy link
Member

jbonofre commented Feb 2, 2023

I agree for the PR, but the Jira should be atomic as it's better for release notes IMHO.
We can group several dep updates in one PR/commit as soon as we have one Jira per update.

I will rebase my changes (I have others on the way).

com.thoughtworks.xstream:xstream .................... 1.4.19 -> 1.4.20
commons-daemon:commons-daemon ......................... 1.3.2 -> 1.3.3
org.apache.ant:ant ................................ 1.10.12 -> 1.10.13
org.apache.shiro:shiro-core ......................... 1.10.1 -> 1.11.0
org.apache.shiro:shiro-spring ....................... 1.10.1 -> 1.11.0
org.codehaus.jettison:jettison ........................ 1.5.2 -> 1.5.3
regexp:regexp ............................................. 1.3 -> 1.5
org.apache.httpcomponents:httpclient ................ 4.5.13 -> 4.5.14
org.apache.httpcomponents:httpcore .................. 4.4.15 -> 4.4.16

- regexp/regexp -> jakarta-regexp/jakarta/regexp
@mattrpav
Copy link
Contributor Author

mattrpav commented Feb 2, 2023

I agree for the PR, but the Jira should be atomic as it's better for release notes IMHO. We can group several dep updates in one PR/commit as soon as we have one Jira per update.

That sounds good, I'll go ahead and update JIRA for individual JIRAs for the release notes. Thx

@cshannon
Copy link
Contributor

cshannon commented Feb 2, 2023

I agree for the PR, but the Jira should be atomic as it's better for release notes IMHO. We can group several dep updates in one PR/commit as soon as we have one Jira per update.

That sounds good, I'll go ahead and update JIRA for individual JIRAs for the release notes. Thx

Right, for minor stuff there's no reason to have like 10 commits when they can be combined into one commit like this but the major stuff like Spring for sure should be by itself.

For Jira I think we should be able to create one top level Jira issue for the minor dependency updates and then have subtasks for each individual update. Then the PR that does the multiple changes at once could just reference the main Jira but the release notes would still list all the individual dependencies because of the sub tasks (I think but need to test)

@jbonofre
Copy link
Member

jbonofre commented Feb 2, 2023

@cshannon yeah it's what I meant. The most important for our users is to have details in the release notes.

@mattrpav mattrpav merged commit 3445456 into apache:main Feb 3, 2023
@mattrpav mattrpav deleted the AMQ-9207 branch February 3, 2023 20:01
asfgit pushed a commit that referenced this pull request Feb 4, 2023
com.thoughtworks.xstream:xstream .................... 1.4.19 -> 1.4.20
commons-daemon:commons-daemon ......................... 1.3.2 -> 1.3.3
org.apache.ant:ant ................................ 1.10.12 -> 1.10.13
org.apache.shiro:shiro-core ......................... 1.10.1 -> 1.11.0
org.apache.shiro:shiro-spring ....................... 1.10.1 -> 1.11.0
org.codehaus.jettison:jettison ........................ 1.5.2 -> 1.5.3
regexp:regexp ............................................. 1.3 -> 1.5
org.apache.httpcomponents:httpclient ................ 4.5.13 -> 4.5.14
org.apache.httpcomponents:httpcore .................. 4.4.15 -> 4.4.16

- regexp/regexp -> jakarta-regexp/jakarta/regexp

(cherry picked from commit 3445456)
cesarhernandezgt pushed a commit to cesarhernandezgt/activemq that referenced this pull request Mar 28, 2023
com.thoughtworks.xstream:xstream .................... 1.4.19 -> 1.4.20
commons-daemon:commons-daemon ......................... 1.3.2 -> 1.3.3
org.apache.ant:ant ................................ 1.10.12 -> 1.10.13
org.apache.shiro:shiro-core ......................... 1.10.1 -> 1.11.0
org.apache.shiro:shiro-spring ....................... 1.10.1 -> 1.11.0
org.codehaus.jettison:jettison ........................ 1.5.2 -> 1.5.3
regexp:regexp ............................................. 1.3 -> 1.5
org.apache.httpcomponents:httpclient ................ 4.5.13 -> 4.5.14
org.apache.httpcomponents:httpcore .................. 4.4.15 -> 4.4.16

- regexp/regexp -> jakarta-regexp/jakarta/regexp

(cherry picked from commit 3445456)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants