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

Revisited glassfish-version.properties and Version class #24322

Merged
merged 2 commits into from
Feb 28, 2023

Conversation

dmatej
Copy link
Contributor

@dmatej dmatej commented Feb 26, 2023

  • Updated from Ant+CVS/SVN style to Mvn+GIT style which is standard these days.
  • Influenced by the discussion with @pzygielo in Issue #24284 Fixed git.build.time #24316 where we came to the conclusion that the buildId is worthless as it doesn't give any straightforward information.
  • Dropped build id - replaced by info about branch, commit and time
  • Renamed keys and methods and vaiables to avoid previous confusion
  • Potentially breaking change if someone relies on old messages in logs or the VersionCommand output (but I doubt it was possible)
  • Depends on Changing version to 7.0.3-SNAPSHOT #24324 (might have conflicts)
  • Fixed reporting startup time including CLI (depended on WALLCLOCK property formatting, exception was swallowed)
  • Test for asadmin and test for the rest api

Log after the change:

[2023-02-27T20:19:51.204774+01:00] [GF 7.0.3-SNAPSHOT] [INFO] [NCLS-CORE-00017] [jakarta.enterprise.system.core] [tid: _ThreadID=1 _ThreadName=main] [levelValue: 800] [[
Eclipse GlassFish 7.0.3-SNAPSHOT (branch: version-info-revisited, commit: 92a180dfa037f24a4531ff5ced89f490c463fa03, timestamp: 2023-02-27T19:10:06Z) startup time: Embedded (1 826 ms), startup services (962 ms), total (2 788 ms)]]

[2023-02-27T20:19:51.205613+01:00] [GF 7.0.3-SNAPSHOT] [INFO] [NCLS-CORE-00018] [jakarta.enterprise.system.core] [tid: _ThreadID=1 _ThreadName=main] [levelValue: 800] [[
Total startup time including CLI: 3 210 ms]]

Changes in logs:

  • Using abbreviation GF instead of GlassFish
  • Using full version 7.0.3-SNAPSHOT
  • Printing detailed information about sources based on GIT - branch name and commit
  • Printing also timestamp as ISO-8601 Instant (always UTC if not set explicitly)
  • Fixed the second line in the second commit; it was throwing an exception which was ignored.

@dmatej dmatej added the enhancement New feature or request label Feb 26, 2023
@dmatej dmatej added this to the 7.0.3 milestone Feb 26, 2023
@dmatej dmatej self-assigned this Feb 26, 2023
- updated from Ant+CVS/SVN style to Mvn+GIT style which is standard these days
- dropped build id - replaced by info about branch, commit and time
- renamed keys and methods and vaiables to avoid previous confusion
- potentially breaking change if someone relies on old messages in logs or
  the VersionCommand output (but I doubt it was possible)

Signed-off-by: David Matějček <[email protected]>
@dmatej dmatej force-pushed the version-info-revisited branch from 293b90e to 92a180d Compare February 27, 2023 19:17
@dmatej dmatej marked this pull request as ready for review February 27, 2023 19:24
- depended on WALLCLOCK property formatting, exception is swallowed

Signed-off-by: David Matějček <[email protected]>
@dmatej dmatej force-pushed the version-info-revisited branch from 92a180d to 0b71644 Compare February 27, 2023 19:33
@arjantijms arjantijms merged commit f05cd0a into eclipse-ee4j:master Feb 28, 2023
@dmatej dmatej deleted the version-info-revisited branch February 28, 2023 14:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants