This is an automated email from the ASF dual-hosted git repository.
gaoxihui pushed a change to branch release-2.2.5-incubating-rc2
in repository https://gitbox.apache.org/repos/asf/ozhera.git
from c8c54b09 refactor: add MIT and other license info for dependency jars
(#546)
add 1aff91ab feat: package does not integrate third-party dependencies and
supports postgreSql as the default database
add 87b16c7b fix: clean up deprecated dependencies
add c27d520c feat: Add script to handle merging license lists
add 4f2fcd99 feat: Add a license file with a three-party license
add 88c49820 feat: add notice for third-party dependencies
add 517925a6 feat: clean up and add third-party dependency declarations
add 812cd2d1 feat: add third-party dependency package declaration
new bd75682e Merge branch 'release-2.2.5-incubating-rc2-dev' into
release-2.2.5-incubating-rc2
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
dist/LICENSE | 644 +++++++
dist/NOTICE | 1863 ++++++++++++++++++++
.../dockerfiles/ozhera-app}/Dockerfile | 6 +-
.../ozhera-demo-client-server/Dockerfile | 4 +-
.../ozhera-demo-server-server/Dockerfile | 4 +-
.../ozhera-log-agent-server}/Dockerfile | 4 +-
.../dockerfiles/ozhera-log-agent}/Dockerfile | 4 +-
.../dockerfiles/ozhera-log-manager}/Dockerfile | 4 +-
.../dockerfiles/ozhera-log-stream}/Dockerfile | 6 +-
.../dockerfiles/ozhera-monitor}/Dockerfile | 3 +-
.../dockerfiles/ozhera-operator}/Dockerfile | 3 +-
.../ozhera-prometheus-agent-server/Dockerfile | 4 +-
.../dockerfiles/ozhera-trace-etl-es}/Dockerfile | 4 +-
.../ozhera-trace-etl-manager}/Dockerfile | 4 +-
.../ozhera-trace-etl-server}/Dockerfile | 4 +-
.../dockerfiles/ozhera-webhook}/Dockerfile | 5 +-
.../sql/hera.sql => dist/sql/mysql/ozhera.sql | 0
dist/sql/postgre/ozhera.sql | 1483 ++++++++++++++++
build.sh => merge-dependency.sh | 19 +-
ozhera-app/app-server/Dockerfile | 8 +-
ozhera-app/app-server/pom.xml | 37 +-
.../apache/ozhera/app/config/DataSourceConfig.java | 8 +-
.../src/main/resources/application.properties | 5 -
ozhera-app/app-service/pom.xml | 15 +-
.../ozhera-demo-client-server/Dockerfile | 6 +-
.../ozhera-demo-client-server/pom.xml | 4 +-
.../ozhera-demo-client-service/pom.xml | 6 +
.../ozhera-demo-server-server/Dockerfile | 6 +-
.../ozhera-demo-server-server/pom.xml | 4 +-
.../main/resources/config/open-source.properties | 1 -
ozhera-log/log-agent-server/Dockerfile | 8 +-
ozhera-log/log-agent-server/pom.xml | 29 -
ozhera-log/log-agent/Dockerfile | 9 +-
ozhera-log/log-agent/pom.xml | 29 -
ozhera-log/log-common/pom.xml | 4 +-
ozhera-log/log-manager/Dockerfile | 10 +-
ozhera-log/log-manager/pom.xml | 40 +-
ozhera-log/log-stream/Dockerfile | 10 +-
ozhera-log/log-stream/pom.xml | 35 -
ozhera-log/pom.xml | 7 -
ozhera-monitor/ozhera-monitor-common/pom.xml | 3 +-
ozhera-monitor/ozhera-monitor-server/Dockerfile | 5 +-
ozhera-monitor/ozhera-monitor-server/pom.xml | 4 +-
ozhera-monitor/ozhera-monitor-service/pom.xml | 43 +-
ozhera-operator/ozhera-operator-server/Dockerfile | 4 +-
ozhera-operator/ozhera-operator-server/pom.xml | 14 +-
.../hera_app_config_#_DEFAULT_GROUP.properties | 5 +
...era_log_manager_open_#_DEFAULT_GROUP.properties | 1 +
.../hera_trace_config_#_DEFAULT_GROUP.properties | 1 +
...us_agent_open_config_#_DEFAULT_GROUP.properties | 2 +-
ozhera-operator/ozhera-operator-service/pom.xml | 12 +-
.../operator/handler/HeraResourceEventHandler.java | 5 +-
.../operator/service/HeraBootstrapInitService.java | 30 +-
.../ozhera-prometheus-agent-common/pom.xml | 2 +-
.../ozhera-prometheus-agent-dao/pom.xml | 16 +-
.../ozhera-prometheus-agent-server/Dockerfile | 6 +-
.../ozhera-prometheus-agent-server/pom.xml | 37 +
ozhera-prometheus-agent/pom.xml | 6 -
ozhera-webhook/ozhera-webhook-server/Dockerfile | 5 +-
ozhera-webhook/ozhera-webhook-server/pom.xml | 4 +-
ozhera-webhook/pom.xml | 4 +-
pom.xml | 43 +-
trace-etl/trace-etl-dao/pom.xml | 10 +-
trace-etl/trace-etl-es/Dockerfile | 6 +-
trace-etl/trace-etl-es/pom.xml | 4 +-
.../trace/etl/es/config/DataSourceConfig.java | 2 +-
.../src/main/resources/application.properties | 3 -
.../resources/config/opensource-outer.properties | 2 -
.../etl/extension/doris/config/DorisConfig.java | 2 +-
trace-etl/trace-etl-manager/Dockerfile | 6 +-
trace-etl/trace-etl-manager/pom.xml | 4 +-
.../trace/etl/manager/config/DataSourceConfig.java | 2 +-
.../src/main/resources/application.properties | 3 -
.../resources/config/opensource-outer.properties | 2 -
trace-etl/trace-etl-server/Dockerfile | 6 +-
trace-etl/trace-etl-server/pom.xml | 10 +-
.../ozhera/trace/etl/config/DataSourceConfig.java | 2 +-
.../src/main/resources/application.properties | 4 -
.../resources/config/opensource-outer.properties | 2 -
trace-etl/trace-etl-service/pom.xml | 12 +
80 files changed, 4355 insertions(+), 328 deletions(-)
create mode 100644 dist/LICENSE
create mode 100644 dist/NOTICE
copy {ozhera-app/app-server => dist/dockerfiles/ozhera-app}/Dockerfile (66%)
copy {ozhera-demo-client =>
dist/dockerfiles}/ozhera-demo-client-server/Dockerfile (55%)
copy {ozhera-demo-server =>
dist/dockerfiles}/ozhera-demo-server-server/Dockerfile (55%)
copy {ozhera-log/log-agent-server =>
dist/dockerfiles/ozhera-log-agent-server}/Dockerfile (66%)
copy {ozhera-log/log-agent => dist/dockerfiles/ozhera-log-agent}/Dockerfile
(71%)
copy {ozhera-log/log-manager =>
dist/dockerfiles/ozhera-log-manager}/Dockerfile (67%)
copy {ozhera-log/log-stream => dist/dockerfiles/ozhera-log-stream}/Dockerfile
(71%)
copy {ozhera-monitor/ozhera-monitor-server =>
dist/dockerfiles/ozhera-monitor}/Dockerfile (57%)
copy {ozhera-operator/ozhera-operator-server =>
dist/dockerfiles/ozhera-operator}/Dockerfile (57%)
copy {ozhera-prometheus-agent =>
dist/dockerfiles}/ozhera-prometheus-agent-server/Dockerfile (59%)
copy {trace-etl/trace-etl-es =>
dist/dockerfiles/ozhera-trace-etl-es}/Dockerfile (57%)
copy {trace-etl/trace-etl-manager =>
dist/dockerfiles/ozhera-trace-etl-manager}/Dockerfile (57%)
copy {trace-etl/trace-etl-server =>
dist/dockerfiles/ozhera-trace-etl-server}/Dockerfile (57%)
copy {ozhera-webhook/ozhera-webhook-server =>
dist/dockerfiles/ozhera-webhook}/Dockerfile (81%)
copy
ozhera-operator/ozhera-operator-server/src/main/resources/ozhera_init/mysql/sql/hera.sql
=> dist/sql/mysql/ozhera.sql (100%)
create mode 100644 dist/sql/postgre/ozhera.sql
copy build.sh => merge-dependency.sh (60%)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
