-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
drop buildnumber:create already executed by jetty-util #11360
Conversation
Thanks for this. jetty.project/jetty-core/jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java Line 83 in 2584eb0
maybe we could repackage the |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
jetty-start's build.properties and jetty-util's build.properties are different.
jetty-start is for the bootstrap, which is loosely tied to a jetty version.
that jetty version is only use for defaulting the jetty-home/jetty-base version.
it can be overridden to be a different version at bootstrap (some folks do this!).
jetty-util build.properties is for runtime.
completely eliminating the build.properties in jetty-start is a no-go, it's necessary and required, but for different reasons than the jetty-util build.properties.
just deleting it from jetty-start like this is not appropriate.
finding a way to copy the jetty-util version to jetty-start i would be ok with.
sorry, the goal documentation was not clear it was generating the file in addition to calculating new property values yes, copying the output from jetty-util is a solution I'll drop this PR, as it is not the right approach to solving the issue |
@joakime @olamy looking more in depth, I noticed that this PR did not remove https://github.com/jetty/jetty.project/blob/jetty-12.0.x/jetty-core/jetty-start/src/main/resources/org/eclipse/jetty/start/build.properties then technically, by dropping the plugin execution but not this resource, this PR did not remove the file, which is finally not done by the plugin: its content is just fully in sync with the one in jetty-util this PR as it is seems to match expectations, finally? |
@hboutemy nah this will not work. look at the code I pointed in a previous comment.
compared to
so we need to include the second one in the jetty-start jar and read it. (can be moved as resource in the path |
@hboutemy don't forget that jetty-start has a normal artifact, and a shaded artifact.
That means we should copy the jetty-util build.properties, not just reference it. |
uh, I did not get that the property defined by the first run of the goal was not available in other modules: good catch |
<overWrite>false</overWrite> | ||
<includes>**/build.properties</includes> | ||
<fileMappers> | ||
<fileMapper implementation="org.codehaus.plexus.components.io.filemappers.FlattenFileMapper"></fileMapper> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Neat. I didn't know this fileMapper existed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, not so easy to find from the plugin documentation: I need to improve it
https://codehaus-plexus.github.io/plexus-io/filemappers.html
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm good with this.
good news, with this PR merged, Jetty 12.0.7 is now confirmed reproducible https://github.com/jvm-repo-rebuild/reproducible-central/blob/master/content/org/eclipse/jetty/jetty-project/README.md |
re-running buildnumber-maven-plugin a second time creates a new timestamp property value, which breaks Reproducible Builds https://github.com/jvm-repo-rebuild/reproducible-central/blob/master/content/org/eclipse/jetty/jetty-project/README.md
AFAIK, the second run is not really necessary, just some cleanup forgotten that until now was not identified as causing any harm