Skip to content

Use subproject to generate distribution instead of root #1463

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

Merged
merged 8 commits into from
Jun 8, 2020

Conversation

jbaiera
Copy link
Member

@jbaiera jbaiera commented Apr 14, 2020

This PR adds a subproject (dist) which collects the contents of all integrations together into the project uberjar, and the zip distribution. Currently, these are created in the root project, mostly without proper dependency modeling.

Creating as Draft to collect some feedback.

@jbaiera jbaiera requested a review from mark-vieira April 14, 2020 18:20
canBeResolved = true
canBeConsumed = false
attributes {
attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage, 'packaging'))
Copy link
Contributor

@mark-vieira mark-vieira Apr 14, 2020

Choose a reason for hiding this comment

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

Brilliant. Seems we've finally nailed down these configuration attributes to work the way we want.

jbaiera added 3 commits April 21, 2020 16:50
Exports for javadoc generation are different from exports required for
source jars because one contains only java code (including generated),
and the other contains original code (java and scala, no generated java)

Add scala code to the regular sources exported configurations.

In scala projects that add source dirs, add the new sources to the
correct configurations.

Fixed a bug where javadocs were not getting all sources passed to them.

Fixed header display for final distribution javadocs.
@jbaiera jbaiera marked this pull request as ready for review April 21, 2020 21:31
@jbaiera
Copy link
Member Author

jbaiera commented Apr 21, 2020

I think I'm good for review on this now. I left in the current root project distribution logic for now since release process depends on it. Once this is merged, I'll make the changes to release process to look at the new location for distribution artifacts, then follow up on this project to remove the old root project distribution tasks.

Copy link
Contributor

@mark-vieira mark-vieira left a comment

Choose a reason for hiding this comment

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

LGTM

@jbaiera jbaiera merged commit 17cf1f1 into elastic:master Jun 8, 2020
@jbaiera jbaiera deleted the add-dist-subproject branch June 8, 2020 20:07
jbaiera added a commit that referenced this pull request Jun 8, 2020
Created a dist project and using it to construct the zip/uberjar
Add javadocSources and javadocElements configurations.
Exports for javadoc generation are different from exports required for
source jars because one contains only java code (including generated),
and the other contains original code (java and scala, no generated java)
Add scala code to the regular sources exported configurations.
In scala projects that add source dirs, add the new sources to the
correct configurations.
@jbaiera
Copy link
Member Author

jbaiera commented Jul 14, 2020

Relates #1423

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.

2 participants