You are viewing a plain text version of this content. The canonical link for it is here.

Posted to notifications@skywalking.apache.org by wu...@apache.org on 2021/10/26 07:05:59 UTC

[skywalking] branch jdk17 updated (e0ed94a -> 4fad97e)

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a change to branch jdk17
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


    from e0ed94a  Fix
     add a5685cb  Add a GraphQL query to get OAP version, display OAP version in startup message and error logs (#8004)
     add 4fad97e  Merge branch 'master' into jdk17

No new revisions were added by this update.

Summary of changes:
 .gitignore                                         |  4 ++
 .licenserc.yaml                                    |  1 +
 CHANGES.md                                         |  1 +
 apm-protocol/apm-network/src/main/proto            |  2 +-
 docker/oap/log4j2.xml                              |  6 ++-
 .../oap/server/core/version/Version.java           | 57 ++++++++++++++++++++++
 .../VersionLogConverter.java}                      | 43 +++++++---------
 .../oap/query/graphql/resolver/Query.java          |  4 +-
 oap-server/server-starter/pom.xml                  | 50 ++++++++++++++++++-
 .../oap/server/starter/OAPServerBootstrap.java     |  3 ++
 .../server-starter/src/main/resources/log4j2.xml   |  6 ++-
 tools/releasing/create_source_release.sh           |  5 ++
 12 files changed, 151 insertions(+), 31 deletions(-)
 create mode 100644 oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/version/Version.java
 copy oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/{exporter/ExportEvent.java => version/VersionLogConverter.java} (50%)