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

Skip non-class files in the exclusions processing #10

Merged
merged 1 commit into from
May 3, 2024

Conversation

vinnybod
Copy link
Member

@vinnybod vinnybod commented May 2, 2024

opened a PR upstream that may end up differing based on feedback, but I think this is good enough to merge in to unblock our own use case. All MergeJarTest tests are still passing with this change, and more jars are passing as equivalent to the Gradle versions.

@vinnybod vinnybod requested a review from a team as a code owner May 2, 2024 23:42
@vinnybod vinnybod enabled auto-merge (squash) May 3, 2024 16:43
@vinnybod vinnybod merged commit 57f3fa7 into master May 3, 2024
1 check passed
@vinnybod vinnybod deleted the vinnybod/DP-14532 branch May 3, 2024 17:50
airlock-confluentinc bot pushed a commit that referenced this pull request Sep 9, 2024
* add codeowners (#1)

* Add exclusion info to pom.xml (#2)

* Make java_export capable of writing exclusions to the POM file it generates.

* Reformatted _exclusion_spec_list_to_json_test_impl

---------

Co-authored-by: Patrick Prémont <[email protected]>

* Add an `implementation_deps` argument to pom generation (#3)

* add bazel equivalent of gradle's 'implementation' scope

* update get_implementation_coordinates

* Update private/rules/maven_utils.bzl

* Update private/rules/pom_file.bzl

* Add an exception for COPYRIGHT and NOTICE files in the same way LICENSE is already supported

* prepend_services argument for java_export (#9)

* initial 'prepend services' implementation

add tests, remove un-needed lines

add comments

* initial 'prepend services' implementation

add tests, remove un-needed lines

add comments

* remove System.out.println from MergeJars

* match indentation a bit better

* match indentation a bit better in MergeJars

* trigger ci

* Skip non-class files in the exclusions processing (#10)

* reimplement license retention on service provider files (#11)

* initial 'prepend services' implementation

add tests, remove un-needed lines

add comments

* remove System.out.println from MergeJars

* match indentation a bit better

* match indentation a bit better in MergeJars

* trigger ci

* concatenate service files instead of prepending license with extra property

* remove unnecessary test

* remove 'prepend-services' feature

* Remove hardcoded javadocopts

* Add support for resources in javadoc jars. Add support for make variable substitution in javadoc arguments. (#14)

* Add support for resources in javadoc jars. Add support for make variable substitution in javadoc arguments.

* remove unused deps

* Add .strip() to assert to account for some difference in windows/mac

* DP-14758 - add classifier to generated pom (#17)

* add classifier to generated pom

* fix typo

* Fix pom generation for classifier artifacts

* fix bad cherry-pick

* support bom generation

* add tests

* add line missing from patch file

* fix incorrect merge conflicts

* fix incorrect merge conflicts

---------

Co-authored-by: Lan Yao <[email protected]>
Co-authored-by: Patrick Prémont <[email protected]>
vinnybod added a commit that referenced this pull request Oct 3, 2024
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