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

[WINDUPRULE-1005]-JWS: Upgrade direct dependencies that belong to the groupId org.apache.tomcat #972

Merged
merged 7 commits into from
Jun 7, 2023

Conversation

carlosthe19916
Copy link
Member

@carlosthe19916 carlosthe19916 commented May 25, 2023

https://issues.redhat.com/browse/WINDUPRULE-1005
Tomcat direct dependency upgrade rules

@carlosthe19916 carlosthe19916 changed the title [WINDUPRULE-977]-Rules and recipes to support migrating to JWS 6 [WINDUPRULE-1005]-JWS: Upgrade direct dependencies that belong to the groupId org.apache.tomcat Jun 1, 2023
@PhilipCattanach
Copy link
Contributor

Hi @carlosthe19916
Looking at this PR if 10.1.0 is the minimum Tomcat version required shouldn't the rules be checking for the toVersion 10.0.999 ?

@carlosthe19916
Copy link
Member Author

Hi @carlosthe19916 Looking at this PR if 10.1.0 is the minimum Tomcat version required shouldn't the rules be checking for the toVersion 10.0.999 ?

@PhilipCattanach you are right! I've just changed the toVersion field to be 10.0.999

@PhilipCattanach
Copy link
Contributor

The test data folder should have included a couple of 'dummy' tomcat artifacts. One with a version below the threshold and the other above. But I ran that test after building the CLI with the ruleset included. The rule fired against tomcat-catalina-10.0.27.jar but not against tomcat-catalina-10.1.0.jar
So I am happy the dependency clause of the when criteria works.

@PhilipCattanach PhilipCattanach merged commit ab7882a into windup:master Jun 7, 2023
mrizzi added a commit that referenced this pull request Jun 8, 2023
* Lombok <1.18.22 is not compatible with JDK 17

* Overriding rules

* [WINDUPRULE-1005]-JWS: Upgrade direct dependencies that belong to the groupId org.apache.tomcat (#972)

* Add tomcat target and dependencies rule

* Add Tomcat direct dependency check rules

* Change toVersion

* check java version for azure (#957)

* check java version for azure

* Azure java version identification

* use winup:matches

---------

Co-authored-by: kaiqianyang <kaiqianyang@microsoftcom>
Co-authored-by: PhilipCattanach <pcattana@redhat.com>

* Enabled 'rules-overridden-azure' testing on GH

---------

Co-authored-by: Carlos E. Feria Vila <carlosthe19916@gmail.com>
Co-authored-by: KaiqianYang <89442934+KaiqianYang@users.noreply.github.com>
Co-authored-by: kaiqianyang <kaiqianyang@microsoftcom>
Co-authored-by: PhilipCattanach <pcattana@redhat.com>
Co-authored-by: mrizzi <mrizzi@redhat.com>
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.

2 participants