Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions quarkus/admin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ distributions {
contents {
from(runScript)
from(project.layout.buildDirectory.dir("quarkus-app"))
from("../../NOTICE")
from("../../LICENSE-BINARY-DIST").rename("LICENSE-BINARY-DIST", "LICENSE")
from("distribution/NOTICE")
from("distribution/LICENSE")
Comment on lines -90 to +91
Copy link
Contributor

Choose a reason for hiding this comment

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

Is it possible to leverage on a super set of LICENSE and NOTICE? So that we don't have to place them in each module.

Copy link
Member Author

Choose a reason for hiding this comment

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

The LICENSE and NOTICE in the root folder are for the source distribution.

admin and server distributions are different LICENSE and NOTICE: you can see the content is different. So, each distribution has its own specific LICENSE and NOTICE.

Copy link
Contributor

Choose a reason for hiding this comment

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

They are different. I am wondering if it's possible to provide a super set so that, we don't have to to go to each individual binary module to generate a different LICENSE and NOTICE, which adds a lot of burden for releasing. IIUC, we potentially have to check each individual module as their jar files are different, #1258 (comment).

Copy link
Member Author

Choose a reason for hiding this comment

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

Ah, you mean a "common" share LICENSE and NOTICE (the common denominator), and add the specific for each ?

Copy link
Contributor

Choose a reason for hiding this comment

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

yeah, that's a close one. I was thinking about an option that we just got a super set of license and notice so that, all other can just reuse it.

Another option is having an automation tool, not sure if that's possible, and how much effort we need to build such a tool.

Copy link
Member Author

Choose a reason for hiding this comment

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

I propose to move forward with this PR (in order to not block the next releases). I will work on possible options to improve this.

}
}
}
Expand Down
1,725 changes: 1,725 additions & 0 deletions quarkus/admin/distribution/LICENSE

Large diffs are not rendered by default.

1,221 changes: 1,221 additions & 0 deletions quarkus/admin/distribution/NOTICE

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions quarkus/server/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ distributions {
contents {
from(runScript)
from(project.layout.buildDirectory.dir("quarkus-app"))
from("../../NOTICE")
from("../../LICENSE-BINARY-DIST").rename("LICENSE-BINARY-DIST", "LICENSE")
from("distribution/NOTICE")
from("distribution/LICENSE")
exclude("lib/main/io.quarkus.quarkus-container-image*")
}
}
Expand Down
Loading