Skip to content

Updating getDependencies to use maven server for downloading asm.jar#778

Merged
smlambert merged 11 commits intoadoptium:masterfrom
adamfarley:update_asm_source
Dec 3, 2025
Merged

Updating getDependencies to use maven server for downloading asm.jar#778
smlambert merged 11 commits intoadoptium:masterfrom
adamfarley:update_asm_source

Conversation

@adamfarley
Copy link
Copy Markdown
Contributor

@adamfarley adamfarley commented Nov 26, 2025

Signed-off-by: Adam Farley <adfarley@ibm.com>
Signed-off-by: Adam Farley <adfarley@ibm.com>
Signed-off-by: Adam Farley <adfarley@ibm.com>
Signed-off-by: Adam Farley <adfarley@ibm.com>
Signed-off-by: Adam Farley <adfarley@ibm.com>
Signed-off-by: Adam Farley <adfarley@ibm.com>
@llxia
Copy link
Copy Markdown
Contributor

llxia commented Nov 27, 2025

@annaibm could you please review?

@adamfarley
Copy link
Copy Markdown
Contributor Author

Note: This PR is now linked to adoptium/aqa-tests#6753 and should be merged around the same time to prevent conflict. See the comments in that PR for details.

Copy link
Copy Markdown
Contributor

@smlambert smlambert left a comment

Choose a reason for hiding this comment

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

Changing my review, since more commits have come in to this PR since I reviewed it.

@smlambert
Copy link
Copy Markdown
Contributor

@adamfarley - I do not think you need to make the additional changes you have added, please take a look at this code
https://github.com/adoptium/aqa-tests/blob/master/buildenv/jenkins/JenkinsfileBase#L226-L229

To see how you can update adoptium/aqa-tests#6753

@sophia-guo
Copy link
Copy Markdown
Contributor

Signed-off-by: Adam Farley <adfarley@ibm.com>
@adamfarley
Copy link
Copy Markdown
Contributor Author

Ok, I've reviewed the links provided and I've amended the code in a way that covers both use cases (and removes the unnecessary argument).

Let me know if this works for you.

@annaibm
Copy link
Copy Markdown
Contributor

annaibm commented Nov 28, 2025

@adamfarley Could you add the related issue link to the PR description? It would help provide the background and make it easier to follow. Thanks!

Signed-off-by: Adam Farley <adfarley@ibm.com>
Signed-off-by: Adam Farley <adfarley@ibm.com>
Signed-off-by: Adam Farley <adfarley@ibm.com>
Signed-off-by: Adam Farley <adfarley@ibm.com>
@adamfarley adamfarley requested a review from smlambert December 1, 2025 14:26
@smlambert smlambert requested review from sophia-guo and removed request for Haroon-Khel December 1, 2025 15:24
@sophia-guo
Copy link
Copy Markdown
Contributor

Originally dir systemtest_prereqs stays because systemtest jars are generated by system test build.xml systemtest_prereqs and archived with the directory.

SYSTEM_LIB_DIR is the location for all system tests dependencies keeping dir systemtest_prereqs is unnecessary. https://github.com/adoptium/TKG/blob/master/scripts/getDependencies.pl#L332 can be removed. And this https://github.com/adoptium/TKG/pull/778/files#diff-6548ada249042f87589ac5683c2f76bd9b8447695fd19fd02ad3030a2592b775R320-R322 is not necessary.

This tools.jar https://github.com/adoptium/TKG/blob/master/scripts/getDependencies.pl#L279 should also move to https://github.com/adoptium/aqa-triage-data/blob/main/AQAvit/

@adamfarley
Copy link
Copy Markdown
Contributor Author

SYSTEM_LIB_DIR is the location for all system tests dependencies keeping dir systemtest_prereqs is unnecessary.

SYSTEM_LIB_DIR doesn't appear to be in-use in the TKG repository. I see that aqa-tests does have it, but I'm not sure we want TKG to have a dependency on aqa-tests.

This tools.jar https://github.com/adoptium/TKG/blob/master/scripts/getDependencies.pl#L279 should also move to https://github.com/adoptium/aqa-triage-data/blob/main/AQAvit/

That sounds like something we should explore in a separate issue.

I've raised one here: #782

Copy link
Copy Markdown
Contributor

@sophia-guo sophia-guo left a comment

Choose a reason for hiding this comment

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

LGTM. Enhancement or clean up is tracked by a separate issue.

@smlambert smlambert merged commit 824ba84 into adoptium:master Dec 3, 2025
3 checks passed
@adamfarley
Copy link
Copy Markdown
Contributor Author

Thanks @smlambert @sophia-guo @annaibm and @karianna 😎

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.

6 participants