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

Add kotlin sources for maven-source-plugin #820

Merged
merged 2 commits into from
Jul 19, 2024

Conversation

rnimour
Copy link
Contributor

@rnimour rnimour commented Jul 18, 2024

Add maven-source-plugin and build-helper-maven-plugin to attach mixed java+kotlin sources, as this SO answer suggests.

I see that the source:jar command is called in a GitHub workflow, so explicitly putting the maven-source-plugin in the pom is not necessary. If I run ./mvnw source:jar locally, it will generate the sources including the kotlin files correctly, where the plugin configuration is inherited from oss-parent.

This should fix #171. In the first pull request to fix this, #175, I find that that author also included:

 <!-- explicitly define maven-deploy-plugin after other to force exec order -->
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-deploy-plugin</artifactId>
...

But I didn't see how this is necessary.

When this fix is verified, it can also be backported to 2.18 and 2.17.

Since I didn't make any code changes, do I still need to fill out the Contributor Licence Agreement?

@cowtowncoder
Copy link
Member

cowtowncoder commented Jul 18, 2024

@rnimour First of all: thank you for submitting this!

Any chance to redo this against 2.18? (or even 2.17) master is for upcoming 3.0.0, which is still months away, so it'd be good to get sources included in 2.x releases.

@cowtowncoder
Copy link
Member

On CLA: not strictly needed since no shippable code changed (same goes for unit tests).

@rnimour
Copy link
Contributor Author

rnimour commented Jul 19, 2024

Hi @cowtowncoder, alright sure, I've backported this change to the 2.18 and 2.17 branches, see #821 and #822

@cowtowncoder
Copy link
Member

cowtowncoder commented Jul 19, 2024

Thank you @rnimour ! Normally it'd be only necessary to do PR for the oldest branch and we can roll forward -- except for pom.xml changes where separate PRs are good (due to version conflicts, merge conflict resolution for pom.xml is "ignore theirs" so we won't be able to automatically get merges)

@cowtowncoder cowtowncoder merged commit e70b6d1 into FasterXML:master Jul 19, 2024
15 checks passed
@cowtowncoder
Copy link
Member

Thank you @rnimour ! I merged all PRs, verified they fix the issue. Should be good for 2.17.3 / 2.18.0(-rc1) releases.

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