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

[Gradle] Scanning of all modules fixed #1383

Merged
merged 7 commits into from
Sep 22, 2024

Conversation

malice00
Copy link
Contributor

I had missed a couple of places in the previous PR, so in some cases some modules were not scanned. This PR should fix this.
This also adds the resolution of modules from so called 'included builds' and the exclusion of the root project in the list of components -- this doesn't always happen, but in elasticsearch for some reason it got included...

Signed-off-by: Roland Asmann <roland.asmann@gmail.com>
Signed-off-by: Roland Asmann <roland.asmann@gmail.com>
@prabhu
Copy link
Collaborator

prabhu commented Sep 22, 2024

@malice00 Thank you so much for your tremendous help! Any ideas on how to test this PR?

@malice00
Copy link
Contributor Author

@prabhu I think I found this issue when testing with elasticsearch... Maybe we could add it to the repotests? If we do, I would however suggest to only test in the multithreaded version, unless you don't mind waiting for HOURS for the results...

@prabhu
Copy link
Collaborator

prabhu commented Sep 22, 2024

@malice00 sure we can add elasticsearch in multi-threading mode to repotests. Is anything else left to make this mode the default?

@malice00
Copy link
Contributor Author

@prabhu Imho we can make this the default. As I mentioned before, the performance gains are almost unbelievable, especially on larger projects. Would you want to keep the singlethreaded solution as an alternative, or completely remove that?
I'll add elastic in the repotests.

Signed-off-by: Roland Asmann <roland.asmann@gmail.com>
@prabhu
Copy link
Collaborator

prabhu commented Sep 22, 2024

@malice00 we can remove the single threaded and keep multi-threaded only. Can you update this PR? Thanks in advance!

@malice00
Copy link
Contributor Author

@prabhu Sure can. Let me work it over a bit, I want to update some parts of the code a bit -- we are doing so much sh** with the ':'-prefix for gradle, which I want to try to optimize.

Signed-off-by: Roland Asmann <roland.asmann@gmail.com>
@malice00
Copy link
Contributor Author

@prabhu Tests seem to be aborting, possibly because they take too long?

@prabhu
Copy link
Collaborator

prabhu commented Sep 22, 2024

Can you try removing -p?

Signed-off-by: Roland Asmann <roland.asmann@gmail.com>
Copy link
Collaborator

@prabhu prabhu left a comment

Choose a reason for hiding this comment

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

Such a cool change that everyone is going to love!

@prabhu
Copy link
Collaborator

prabhu commented Sep 22, 2024

@heubeck Do you see performance improvements for your tests with this PR?

Signed-off-by: Roland Asmann <roland.asmann@gmail.com>
… resolved from NPM

Signed-off-by: Roland Asmann <roland.asmann@gmail.com>
@malice00
Copy link
Contributor Author

There, now multithreaded is the default and internally we don't add and remove the ':' all the time.
As always: feedback very welcome!

@prabhu
Copy link
Collaborator

prabhu commented Sep 22, 2024

Thank you so much for your attention to detail! Let me merge this tonight once the tests are done.

@prabhu prabhu merged commit f1b4be6 into CycloneDX:master Sep 22, 2024
20 of 21 checks passed
@malice00 malice00 deleted the fix/deep_gradle branch September 22, 2024 21:29
@heubeck
Copy link
Contributor

heubeck commented Sep 23, 2024

@heubeck Do you see performance improvements for your tests with this PR?

will keep an eye on it, but made the multi-threaded more already my default since our last "gradle issue" :P

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