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

Fix LICENSE/LICENSE.bin for release #495

Merged
merged 1 commit into from
Dec 19, 2024
Merged

Conversation

jbonofre
Copy link
Member

@jbonofre jbonofre commented Nov 28, 2024

  • Fix LICENSE to be included in source distribution
  • Add LICENSE-BINARY-DIST and include in the binary distributions

polaris-service/build.gradle.kts Outdated Show resolved Hide resolved
LICENSE Outdated Show resolved Hide resolved
gradle/libs.versions.toml Outdated Show resolved Hide resolved
LICENSE.bin Outdated Show resolved Hide resolved
Copy link
Contributor

@flyrain flyrain left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks @jbonofre for driving this.

@jbonofre
Copy link
Member Author

@snazy @flyrain I updated the PR with your comments.

Copy link
Contributor

@flyrain flyrain left a comment

Choose a reason for hiding this comment

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

1

@jbonofre jbonofre linked an issue Dec 15, 2024 that may be closed by this pull request
Add LICENSE-BINARY-DIST and include the binary distributions
@jbonofre
Copy link
Member Author

@snazy I nuked the polaris-service/build.gradle.kts and rebase

@@ -183,4 183,13 @@ tasks.register<Sync>("prepareDockerDist") {

tasks.named("build").configure { dependsOn("prepareDockerDist") }

distributions {
Copy link
Member

Choose a reason for hiding this comment

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

Hm - it looks like none of the dist(s) actually works.

./gradlew :polaris-dropwizard-service:assembleDist

generates TWO sets of distributions:

$ ls -1 dropwizard/service/build/distributions/
polaris-dropwizard-service-1.0.0-incubating-SNAPSHOT-license-report.zip
polaris-dropwizard-service-1.0.0-incubating-SNAPSHOT.tar
polaris-dropwizard-service-1.0.0-incubating-SNAPSHOT.zip
polaris-dropwizard-service-shadow-1.0.0-incubating-SNAPSHOT.tar
polaris-dropwizard-service-shadow-1.0.0-incubating-SNAPSHOT.zip

The "non shadow" one has the NOTICE & LICENSE files, but running polaris-dropwizard-service-1.0.0-incubating-SNAPSHOT/bin/polaris-service leads to

Error: Could not find or load main class org.apache.polaris.service.dropwizard.PolarisApplication
Caused by: java.lang.ClassNotFoundException: org.apache.polaris.service.dropwizard.PolarisApplication

The "shadow" does not have the NOTICE LICENSE files, but running polaris-dropwizard-service-shadow-1.0.0-incubating-SNAPSHOT/bin/polaris-dropwizard-service does something.

Copy link
Member Author

@jbonofre jbonofre Dec 16, 2024

Choose a reason for hiding this comment

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

Yes, the polaris-service script never worked (see #542 ). It's not related to this PR, it's like this for a while.

Good point about "shadow" distribution. I actually wonder if we need both (only one binary distribution is enough).

Copy link
Member

Choose a reason for hiding this comment

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

Frankly speaking, I think it's even better to get #469 in and let it replace the DW stuff entirely. Especially given the amount of issues.

Copy link
Member Author

Choose a reason for hiding this comment

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

Agree, but that's another PR/proposal/discussion 😄 . In the meantime, I propose:

  1. To use only one binary distribution (let me test both to see if one actually works 😄 )
  2. That's a short term solution waiting the "new" runtime

@flyrain flyrain added this to the 0.9.0 milestone Dec 19, 2024
@flyrain flyrain merged commit 9089989 into apache:main Dec 19, 2024
5 checks passed
@flyrain
Copy link
Contributor

flyrain commented Dec 19, 2024

Thanks @jbonofre for the PR, thanks @snazy for the reivew.

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.

Add NOTICE LICENSE* as static resources to distributables
3 participants