This is an automated email from the ASF dual-hosted git repository.
gaoxihui pushed a commit to branch release-2.2.5-incubating-rc2
in repository https://gitbox.apache.org/repos/asf/ozhera.git
The following commit(s) were added to refs/heads/release-2.2.5-incubating-rc2
by this push:
new 91da73ff feat: organize the license required for version release
91da73ff is described below
commit 91da73fff3d3f3b6ae0dabf2541709c418e868f1
Author: gaoxihui <[email protected]>
AuthorDate: Fri Feb 28 15:08:53 2025 +0800
feat: organize the license required for version release
---
assembly.xml | 8 +--
dist/LICENSE | 30 ++--------
dist/NOTICE | 64 ---------------------
.../ozhera-demo-client-server/Dockerfile | 28 ---------
.../ozhera-demo-server-server/Dockerfile | 28 ---------
dist/licenses/bsd/LICENSE-postgresql.txt | 33 +++++++++++
.../{ => other}/apache/LICENSE-grpc-api.txt | 0
.../{ => other}/apache/LICENSE-grpc-context.txt | 0
.../{ => other}/apache/LICENSE-grpc-core.txt | 0
.../{ => other}/apache/LICENSE-grpc-inprocess.txt | 0
.../apache/LICENSE-grpc-netty-shaded.txt | 0
.../apache/LICENSE-grpc-protobuf-lite.txt | 0
.../{ => other}/apache/LICENSE-grpc-protobuf.txt | 0
.../{ => other}/apache/LICENSE-grpc-services.txt | 0
.../{ => other}/apache/LICENSE-grpc-stub.txt | 0
.../{ => other}/apache/LICENSE-grpc-util.txt | 0
.../{ => other}/apache/LICENSE-infra-common.txt | 0
.../{ => other}/apache/LICENSE-perfmark-api.txt | 0
.../apache/LICENSE-proto-google-common-protos.txt | 0
.../{ => other}/bsd/LICENSE-protobuf-java-util.txt | 0
.../mit/LICENSE-animal-sniffer-annotations.txt | 0
...CENSE-grpc-client-spring-boot-autoconfigure.txt | 0
.../LICENSE-grpc-client-spring-boot-starter.txt | 0
.../mit/LICENSE-grpc-common-spring-boot.txt | 0
...CENSE-grpc-server-spring-boot-autoconfigure.txt | 0
.../LICENSE-grpc-server-spring-boot-starter.txt | 0
.../mit/LICENSE-grpc-spring-boot-starter.txt | 0
.../ozhera-intelligence-server/pom.xml | 4 +-
ozhera-log/log-agent/pom.xml | 67 +++++++++-------------
sort.sh | 30 ++++++++++
trace-etl/trace-etl-metadata/pom.xml | 4 +-
trace-etl/trace-etl-nginx/pom.xml | 4 +-
32 files changed, 105 insertions(+), 195 deletions(-)
diff --git a/assembly.xml b/assembly.xml
index e2082ff6..2af3b809 100644
--- a/assembly.xml
+++ b/assembly.xml
@@ -152,7 +152,7 @@
<!-- ozhera-demo-client -->
- <fileSet>
+ <!--<fileSet>
<directory>
ozhera-demo-client/ozhera-demo-client-server/target/
</directory>
@@ -174,10 +174,10 @@
<include>download-opentelemetry-javaagent.sh</include>
<include>README.md</include>
</includes>
- </fileSet>
+ </fileSet>-->
<!-- ozhera-demo-server -->
- <fileSet>
+ <!--<fileSet>
<directory>
ozhera-demo-server/ozhera-demo-server-server/target/
</directory>
@@ -199,7 +199,7 @@
<include>download-opentelemetry-javaagent.sh</include>
<include>README.md</include>
</includes>
- </fileSet>
+ </fileSet>-->
<!-- log-agent -->
diff --git a/dist/LICENSE b/dist/LICENSE
index 9e7a1848..27562dec 100644
--- a/dist/LICENSE
+++ b/dist/LICENSE
@@ -228,6 +228,7 @@ See licenses/ for text of these licenses.
(Apache License, Version 2.0) Apache Commons Compress
(org.apache.commons:commons-compress:1.26.0 -
https://commons.apache.org/proper/commons-compress/)
(Apache License, Version 2.0) Apache Commons IO
(commons-io:commons-io:2.14.0 - https://commons.apache.org/proper/commons-io/)
(Apache License, Version 2.0) Apache Commons Lang
(org.apache.commons:commons-lang3:3.12.0 -
https://commons.apache.org/proper/commons-lang/)
+ (Apache License, Version 2.0) Apache Commons Logging
(commons-logging:commons-logging:1.2 -
http://commons.apache.org/proper/commons-logging/)
(Apache License, Version 2.0) Apache Commons Pool
(org.apache.commons:commons-pool2:2.11.1 -
https://commons.apache.org/proper/commons-pool/)
(Apache License, Version 2.0) Apache Commons Text
(org.apache.commons:commons-text:1.10.0 -
https://commons.apache.org/proper/commons-text)
(Apache License, Version 2.0) Apache Commons Validator
(commons-validator:commons-validator:1.7 -
http://commons.apache.org/proper/commons-validator/)
@@ -278,7 +279,6 @@ See licenses/ for text of these licenses.
(Apache License, Version 2.0) Fabric8 :: Kubernetes Model :: Storage
Class (io.fabric8:kubernetes-model-storageclass:5.11.2 -
http://fabric8.io/kubernetes-model-generator/kubernetes-model-storageclass/)
(Apache License, Version 2.0) FindBugs-jsr305
(com.google.code.findbugs:jsr305:3.0.2 - http://findbugs.sourceforge.net/)
(Apache License, Version 2.0) Generex (com.github.mifmif:generex:1.0.2 -
https://github.com/mifmif/Generex/tree/master)
- (Apache License, Version 2.0) Google Android Annotations Library
(com.google.android:annotations:4.1.1.4 - http://source.android.com/)
(Apache License, Version 2.0) Gson (com.google.code.gson:gson:2.10.1 -
https://github.com/google/gson/gson)
(Apache License, Version 2.0) Guava InternalFutureFailureAccess and
InternalFutures (com.google.guava:failureaccess:1.0.1 -
https://github.com/google/guava/failureaccess)
(Apache License, Version 2.0) Guava ListenableFuture only
(com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava -
https://github.com/google/guava/listenablefuture)
@@ -428,19 +428,8 @@ See licenses/ for text of these licenses.
(Apache License, Version 2.0) gateway-dingtalk
(com.aliyun:gateway-dingtalk:1.0.2 -
https://github.com/aliyun/alibabacloud-gateway)
(Apache License, Version 2.0) hera-trace (run.mone:hera-trace:1.6.1-jdk21
- https://github.com/XiaoMi/mone/hera/hera-trace)
(Apache License, Version 2.0) http (run.mone:http:1.6.1-jdk21 -
https://github.com/XiaoMi/mone/http)
- (Apache License, Version 2.0) infra-common
(run.mone:infra-common:1.6.1-jdk21 -
https://github.com/XiaoMi/mone/infra-common)
(Apache License, Version 2.0) infra-result
(run.mone:infra-result:1.6.1-jdk21 -
https://github.com/XiaoMi/mone/infra-result)
(Apache License, Version 2.0) ini4j (org.ini4j:ini4j:0.5.4 -
http://www.ini4j.org)
- (Apache License, Version 2.0) io.grpc:grpc-api (io.grpc:grpc-api:1.58.0 -
https://github.com/grpc/grpc-java)
- (Apache License, Version 2.0) io.grpc:grpc-context
(io.grpc:grpc-context:1.58.0 - https://github.com/grpc/grpc-java)
- (Apache License, Version 2.0) io.grpc:grpc-core (io.grpc:grpc-core:1.58.0
- https://github.com/grpc/grpc-java)
- (Apache License, Version 2.0) io.grpc:grpc-inprocess
(io.grpc:grpc-inprocess:1.58.0 - https://github.com/grpc/grpc-java)
- (Apache License, Version 2.0) io.grpc:grpc-netty-shaded
(io.grpc:grpc-netty-shaded:1.58.0 - https://github.com/grpc/grpc-java)
- (Apache License, Version 2.0) io.grpc:grpc-protobuf
(io.grpc:grpc-protobuf:1.58.0 - https://github.com/grpc/grpc-java)
- (Apache License, Version 2.0) io.grpc:grpc-protobuf-lite
(io.grpc:grpc-protobuf-lite:1.58.0 - https://github.com/grpc/grpc-java)
- (Apache License, Version 2.0) io.grpc:grpc-services
(io.grpc:grpc-services:1.58.0 - https://github.com/grpc/grpc-java)
- (Apache License, Version 2.0) io.grpc:grpc-stub (io.grpc:grpc-stub:1.58.0
- https://github.com/grpc/grpc-java)
- (Apache License, Version 2.0) io.grpc:grpc-util (io.grpc:grpc-util:1.58.0
- https://github.com/grpc/grpc-java)
(Apache License, Version 2.0) jackson-databind
(com.fasterxml.jackson.core:jackson-databind:2.13.5 -
http://github.com/FasterXML/jackson)
(Apache License, Version 2.0) jackson-dataformat-msgpack
(org.msgpack:jackson-dataformat-msgpack:0.8.21 - http://msgpack.org/)
(Apache License, Version 2.0) lang-mustache
(org.elasticsearch.plugin:lang-mustache-client:7.10.0 -
https://github.com/elastic/elasticsearch)
@@ -475,10 +464,8 @@ See licenses/ for text of these licenses.
(Apache License, Version 2.0) org.opentest4j:opentest4j
(org.opentest4j:opentest4j:1.2.0 - https://github.com/ota4j-team/opentest4j)
(Apache License, Version 2.0) org.xmlunit:xmlunit-core
(org.xmlunit:xmlunit-core:2.9.1 - https://www.xmlunit.org/)
(Apache License, Version 2.0) parent-join
(org.elasticsearch.plugin:parent-join-client:7.10.0 -
https://github.com/elastic/elasticsearch)
- (Apache License, Version 2.0) perfmark:perfmark-api
(io.perfmark:perfmark-api:0.26.0 - https://github.com/perfmark/perfmark)
(Apache License, Version 2.0) project ':json-path'
(com.jayway.jsonpath:json-path:2.7.0 - https://github.com/jayway/JsonPath)
(Apache License, Version 2.0) prometheus-trace-etl
(run.mone:prometheus-trace-etl:1.6.1-jdk21 -
https://github.com/XiaoMi/mone/prometheus/prometheus-trace-etl)
- (Apache License, Version 2.0) proto-google-common-protos
(com.google.api.grpc:proto-google-common-protos:2.22.0 -
https://github.com/googleapis/sdk-platform-java)
(Apache License, Version 2.0) protostuff :: api
(io.protostuff:protostuff-api:1.8.0 -
https://protostuff.github.io/protostuff-api)
(Apache License, Version 2.0) protostuff :: collectionschema
(io.protostuff:protostuff-collectionschema:1.8.0 -
https://protostuff.github.io/protostuff-collectionschema)
(Apache License, Version 2.0) protostuff :: core
(io.protostuff:protostuff-core:1.8.0 -
https://protostuff.github.io/protostuff-core)
@@ -522,7 +509,6 @@ See licenses/ for text of these licenses.
(Apache License, Version 2.0) tomcat-embed-websocket
(org.apache.tomcat.embed:tomcat-embed-websocket:9.0.79 -
https://tomcat.apache.org/)
(Apache License, Version 2.0) zjsonpatch (io.fabric8:zjsonpatch:0.3.0 -
https://github.com/fabric8io/zjsonpatch/)
(Apache License, version 2.0) JBoss Logging 3
(org.jboss.logging:jboss-logging:3.4.1.Final - http://www.jboss.org)
- (Apache License, Version 2.0) Apache Commons Logging
(commons-logging:commons-logging:1.2 -
http://commons.apache.org/proper/commons-logging/)
=========================================================================================
Third party BSD licenses
@@ -536,8 +522,7 @@ See licenses/ for text of these licenses.
(BSD 2-Clause License) zstd-jni (com.github.luben:zstd-jni:1.5.2-2 -
https://github.com/luben/zstd-jni)
(BSD 3-clause New License) dom4j (org.dom4j:dom4j:2.1.3 -
http://dom4j.github.io/)
(BSD-3-Clause) ANTLR 4 Runtime (org.antlr:antlr4-runtime:4.12.0 -
https://www.antlr.org/antlr4-runtime/)
- (BSD-3-Clause) Protocol Buffers [Core]
(com.google.protobuf:protobuf-java:3.24.0 -
https://developers.google.com/protocol-buffers/protobuf-java/)
- (BSD-3-Clause) Protocol Buffers [Util]
(com.google.protobuf:protobuf-java-util:3.24.0 -
https://developers.google.com/protocol-buffers/protobuf-java-util/)
+ (BSD-3-Clause) Protocol Buffers [Core]
(com.google.protobuf:protobuf-java:3.19.4 -
https://developers.google.com/protocol-buffers/protobuf-java/)
(BSD-3-Clause) asm (org.ow2.asm:asm:9.3 - http://asm.ow2.io/)
(The 3-Clause BSD License) (WTFPL) Reflections
(org.reflections:reflections:0.9.11 - http://github.com/ronmamo/reflections)
(The 3-Clause BSD License) Automaton (dk.brics.automaton:automaton:1.11-8
- http://www.brics.dk/automaton/)
@@ -598,23 +583,16 @@ Third party MIT licenses
The following components are provided under the MIT License.
See licenses/ for text of these licenses.
- (The MIT license) Animal Sniffer Annotations
(org.codehaus.mojo:animal-sniffer-annotations:1.23 -
https://www.mojohaus.org/animal-sniffer/animal-sniffer-annotations)
- (The MIT license) Jedis (redis.clients:jedis:4.2.0 -
https://github.com/redis/jedis)
- (The MIT License (MIT)) pagehelper 5
(com.github.pagehelper:pagehelper:5.3.1 -
https://github.com/pagehelper/Mybatis-PageHelper)
+ (The MIT License) pagehelper 5 (com.github.pagehelper:pagehelper:5.3.1 -
https://github.com/pagehelper/Mybatis-PageHelper)
(The MIT License) Checker Qual (org.checkerframework:checker-qual:3.41.0
- https://checkerframework.org/)
(The MIT License) JOpt Simple (net.sf.jopt-simple:jopt-simple:5.0.2 -
http://pholser.github.io/jopt-simple)
(The MIT License) JUL to SLF4J bridge (org.slf4j:jul-to-slf4j:1.7.36 -
http://www.slf4j.org)
(The MIT License) Project Lombok (org.projectlombok:lombok:1.18.30 -
https://projectlombok.org)
(The MIT License) SLF4J API Module (org.slf4j:slf4j-api:1.7.36 -
http://www.slf4j.org)
(The MIT License) SLF4J Reload4j Binding (org.slf4j:slf4j-reload4j:1.7.36
- http://reload4j.qos.ch)
- (The MIT License) gRPC Spring Boot Starter
(net.devh:grpc-client-spring-boot-autoconfigure:2.15.0.RELEASE -
https://github.com/yidongnan/grpc-spring-boot-starter)
- (The MIT License) gRPC Spring Boot Starter
(net.devh:grpc-client-spring-boot-starter:2.15.0.RELEASE -
https://github.com/yidongnan/grpc-spring-boot-starter)
- (The MIT License) gRPC Spring Boot Starter
(net.devh:grpc-common-spring-boot:2.15.0.RELEASE -
https://github.com/yidongnan/grpc-spring-boot-starter)
- (The MIT License) gRPC Spring Boot Starter
(net.devh:grpc-server-spring-boot-autoconfigure:2.15.0.RELEASE -
https://github.com/yidongnan/grpc-spring-boot-starter)
- (The MIT License) gRPC Spring Boot Starter
(net.devh:grpc-server-spring-boot-starter:2.15.0.RELEASE -
https://github.com/yidongnan/grpc-spring-boot-starter)
- (The MIT License) gRPC Spring Boot Starter
(net.devh:grpc-spring-boot-starter:2.15.0.RELEASE -
https://github.com/yidongnan/grpc-spring-boot-starter)
(The MIT License) mockito-core (org.mockito:mockito-core:4.5.1 -
https://github.com/mockito/mockito)
(The MIT License) mockito-junit-jupiter
(org.mockito:mockito-junit-jupiter:4.5.1 - https://github.com/mockito/mockito)
+ (The MIT license) Jedis (redis.clients:jedis:4.2.0 -
https://github.com/redis/jedis)
========================================================================
diff --git a/dist/NOTICE b/dist/NOTICE
index fcd706e9..d58d2246 100644
--- a/dist/NOTICE
+++ b/dist/NOTICE
@@ -536,70 +536,6 @@ decompression for Java., which can be obtained at:
* HOMEPAGE:
* https://github.com/hyperxpro/Brotli4j
--------------------------------------- gRPC NOTICE
--------------------------------------
-Copyright 2014 The gRPC Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
------------------------------------------------------------------------
-
-This product contains a modified portion of 'OkHttp', an open source
-HTTP & SPDY client for Android and Java applications, which can be obtained
-at:
-
- * LICENSE:
- * okhttp/third_party/okhttp/LICENSE (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/square/okhttp
- * LOCATION_IN_GRPC:
- * okhttp/third_party/okhttp
-
-This product contains a modified portion of 'Envoy', an open source
-cloud-native high-performance edge/middle/service proxy, which can be
-obtained at:
-
- * LICENSE:
- * xds/third_party/envoy/LICENSE (Apache License 2.0)
- * NOTICE:
- * xds/third_party/envoy/NOTICE
- * HOMEPAGE:
- * https://www.envoyproxy.io
- * LOCATION_IN_GRPC:
- * xds/third_party/envoy
-
-This product contains a modified portion of 'protoc-gen-validate (PGV)',
-an open source protoc plugin to generate polyglot message validators,
-which can be obtained at:
-
- * LICENSE:
- * xds/third_party/protoc-gen-validate/LICENSE (Apache License 2.0)
- * NOTICE:
- * xds/third_party/protoc-gen-validate/NOTICE
- * HOMEPAGE:
- * https://github.com/envoyproxy/protoc-gen-validate
- * LOCATION_IN_GRPC:
- * xds/third_party/protoc-gen-validate
-
-This product contains a modified portion of 'udpa',
-an open source universal data plane API, which can be obtained at:
-
- * LICENSE:
- * xds/third_party/udpa/LICENSE (Apache License 2.0)
- * HOMEPAGE:
- * https://github.com/cncf/udpa
- * LOCATION_IN_GRPC:
- * xds/third_party/udpa
-
-------------------------------------- Micrometer NOTICE
--------------------------------------
Micrometer
diff --git a/dist/dockerfiles/ozhera-demo-client-server/Dockerfile
b/dist/dockerfiles/ozhera-demo-client-server/Dockerfile
deleted file mode 100644
index f7574fbe..00000000
--- a/dist/dockerfiles/ozhera-demo-client-server/Dockerfile
+++ /dev/null
@@ -1,28 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-FROM openjdk:21-jdk-bookworm
-
-RUN echo 'Asia/Shanghai' >/etc/timezone
-ARG SRC_PATH
-ARG LIB_PATH
-ARG APP_VERSION
-COPY ${SRC_PATH}/ozhera-demo-client-server-${APP_VERSION}.jar
/home/work/ozhera-demo-client-server.jar
-COPY ./opentelemetry-javaagent.jar /opt/soft/opentelemetry-javaagent.jar
-
-COPY ${LIB_PATH}/lib /home/work/lib/
-COPY ${LIB_PATH}/ext-lib /home/work/lib/
-
-ENTRYPOINT ["java", "-javaagent:/opt/soft/opentelemetry-javaagent.jar",
"-Dotel.exporter.prometheus.nacos.addr=nacos:80",
"-Dotel.exporter.log.pathprefix=/home/work/log/", "-XX:+UseZGC",
"--add-opens=java.base/java.lang=ALL-UNNAMED",
"--add-opens=java.base/java.util=ALL-UNNAMED",
"--add-opens=java.base/java.math=ALL-UNNAMED",
"--add-opens=java.base/sun.reflect=ALL-UNNAMED",
"--add-opens=java.base/java.xml=ALL-UNNAMED",
"--add-exports=java.base/sun.reflect.annotation=ALL-UNNAMED", "--add- [...]
\ No newline at end of file
diff --git a/dist/dockerfiles/ozhera-demo-server-server/Dockerfile
b/dist/dockerfiles/ozhera-demo-server-server/Dockerfile
deleted file mode 100644
index ed64a242..00000000
--- a/dist/dockerfiles/ozhera-demo-server-server/Dockerfile
+++ /dev/null
@@ -1,28 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-FROM openjdk:21-jdk-bookworm
-
-RUN echo 'Asia/Shanghai' >/etc/timezone
-ARG SRC_PATH
-ARG LIB_PATH
-ARG APP_VERSION
-COPY ${SRC_PATH}/ozhera-demo-server-server-${APP_VERSION}.jar
/home/work/hera-demo-server/ozhera-demo-server-server.jar
-COPY ./opentelemetry-javaagent.jar /opt/soft/opentelemetry-javaagent.jar
-
-COPY ${LIB_PATH}/lib /home/work/lib/
-COPY ${LIB_PATH}/ext-lib /home/work/lib/
-
-ENTRYPOINT ["java", "-javaagent:/opt/soft/opentelemetry-javaagent.jar",
"-Dotel.exporter.prometheus.nacos.addr=nacos:80",
"-Dotel.exporter.log.pathprefix=/home/work/log/", "-XX:+UseZGC",
"--add-opens=java.base/java.lang=ALL-UNNAMED",
"--add-opens=java.base/java.util=ALL-UNNAMED",
"--add-opens=java.base/java.math=ALL-UNNAMED",
"--add-opens=java.base/sun.reflect=ALL-UNNAMED",
"--add-opens=java.base/java.xml=ALL-UNNAMED",
"--add-exports=java.base/sun.reflect.annotation=ALL-UNNAMED", "--add- [...]
\ No newline at end of file
diff --git a/dist/licenses/bsd/LICENSE-postgresql.txt
b/dist/licenses/bsd/LICENSE-postgresql.txt
new file mode 100644
index 00000000..d5d4b48f
--- /dev/null
+++ b/dist/licenses/bsd/LICENSE-postgresql.txt
@@ -0,0 +1,33 @@
+Copyright (c) 1997, PostgreSQL Global Development Group
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+Additional License files can be found in the 'licenses' folder located in the
same directory as the LICENSE file (i.e. this file)
+
+- Software produced outside the ASF which is available under other licenses
(not Apache-2.0)
+
+BSD-2-Clause
+* com.ongres.scram:client:2.1
+* com.ongres.scram:common:2.1
+* com.ongres.stringprep:saslprep:1.1
+* com.ongres.stringprep:stringprep:1.1
\ No newline at end of file
diff --git a/dist/licenses/apache/LICENSE-grpc-api.txt
b/dist/licenses/other/apache/LICENSE-grpc-api.txt
similarity index 100%
rename from dist/licenses/apache/LICENSE-grpc-api.txt
rename to dist/licenses/other/apache/LICENSE-grpc-api.txt
diff --git a/dist/licenses/apache/LICENSE-grpc-context.txt
b/dist/licenses/other/apache/LICENSE-grpc-context.txt
similarity index 100%
rename from dist/licenses/apache/LICENSE-grpc-context.txt
rename to dist/licenses/other/apache/LICENSE-grpc-context.txt
diff --git a/dist/licenses/apache/LICENSE-grpc-core.txt
b/dist/licenses/other/apache/LICENSE-grpc-core.txt
similarity index 100%
rename from dist/licenses/apache/LICENSE-grpc-core.txt
rename to dist/licenses/other/apache/LICENSE-grpc-core.txt
diff --git a/dist/licenses/apache/LICENSE-grpc-inprocess.txt
b/dist/licenses/other/apache/LICENSE-grpc-inprocess.txt
similarity index 100%
rename from dist/licenses/apache/LICENSE-grpc-inprocess.txt
rename to dist/licenses/other/apache/LICENSE-grpc-inprocess.txt
diff --git a/dist/licenses/apache/LICENSE-grpc-netty-shaded.txt
b/dist/licenses/other/apache/LICENSE-grpc-netty-shaded.txt
similarity index 100%
rename from dist/licenses/apache/LICENSE-grpc-netty-shaded.txt
rename to dist/licenses/other/apache/LICENSE-grpc-netty-shaded.txt
diff --git a/dist/licenses/apache/LICENSE-grpc-protobuf-lite.txt
b/dist/licenses/other/apache/LICENSE-grpc-protobuf-lite.txt
similarity index 100%
rename from dist/licenses/apache/LICENSE-grpc-protobuf-lite.txt
rename to dist/licenses/other/apache/LICENSE-grpc-protobuf-lite.txt
diff --git a/dist/licenses/apache/LICENSE-grpc-protobuf.txt
b/dist/licenses/other/apache/LICENSE-grpc-protobuf.txt
similarity index 100%
rename from dist/licenses/apache/LICENSE-grpc-protobuf.txt
rename to dist/licenses/other/apache/LICENSE-grpc-protobuf.txt
diff --git a/dist/licenses/apache/LICENSE-grpc-services.txt
b/dist/licenses/other/apache/LICENSE-grpc-services.txt
similarity index 100%
rename from dist/licenses/apache/LICENSE-grpc-services.txt
rename to dist/licenses/other/apache/LICENSE-grpc-services.txt
diff --git a/dist/licenses/apache/LICENSE-grpc-stub.txt
b/dist/licenses/other/apache/LICENSE-grpc-stub.txt
similarity index 100%
rename from dist/licenses/apache/LICENSE-grpc-stub.txt
rename to dist/licenses/other/apache/LICENSE-grpc-stub.txt
diff --git a/dist/licenses/apache/LICENSE-grpc-util.txt
b/dist/licenses/other/apache/LICENSE-grpc-util.txt
similarity index 100%
rename from dist/licenses/apache/LICENSE-grpc-util.txt
rename to dist/licenses/other/apache/LICENSE-grpc-util.txt
diff --git a/dist/licenses/apache/LICENSE-infra-common.txt
b/dist/licenses/other/apache/LICENSE-infra-common.txt
similarity index 100%
rename from dist/licenses/apache/LICENSE-infra-common.txt
rename to dist/licenses/other/apache/LICENSE-infra-common.txt
diff --git a/dist/licenses/apache/LICENSE-perfmark-api.txt
b/dist/licenses/other/apache/LICENSE-perfmark-api.txt
similarity index 100%
rename from dist/licenses/apache/LICENSE-perfmark-api.txt
rename to dist/licenses/other/apache/LICENSE-perfmark-api.txt
diff --git a/dist/licenses/apache/LICENSE-proto-google-common-protos.txt
b/dist/licenses/other/apache/LICENSE-proto-google-common-protos.txt
similarity index 100%
rename from dist/licenses/apache/LICENSE-proto-google-common-protos.txt
rename to dist/licenses/other/apache/LICENSE-proto-google-common-protos.txt
diff --git a/dist/licenses/bsd/LICENSE-protobuf-java-util.txt
b/dist/licenses/other/bsd/LICENSE-protobuf-java-util.txt
similarity index 100%
rename from dist/licenses/bsd/LICENSE-protobuf-java-util.txt
rename to dist/licenses/other/bsd/LICENSE-protobuf-java-util.txt
diff --git a/dist/licenses/mit/LICENSE-animal-sniffer-annotations.txt
b/dist/licenses/other/mit/LICENSE-animal-sniffer-annotations.txt
similarity index 100%
rename from dist/licenses/mit/LICENSE-animal-sniffer-annotations.txt
rename to dist/licenses/other/mit/LICENSE-animal-sniffer-annotations.txt
diff --git
a/dist/licenses/mit/LICENSE-grpc-client-spring-boot-autoconfigure.txt
b/dist/licenses/other/mit/LICENSE-grpc-client-spring-boot-autoconfigure.txt
similarity index 100%
rename from dist/licenses/mit/LICENSE-grpc-client-spring-boot-autoconfigure.txt
rename to
dist/licenses/other/mit/LICENSE-grpc-client-spring-boot-autoconfigure.txt
diff --git a/dist/licenses/mit/LICENSE-grpc-client-spring-boot-starter.txt
b/dist/licenses/other/mit/LICENSE-grpc-client-spring-boot-starter.txt
similarity index 100%
rename from dist/licenses/mit/LICENSE-grpc-client-spring-boot-starter.txt
rename to dist/licenses/other/mit/LICENSE-grpc-client-spring-boot-starter.txt
diff --git a/dist/licenses/mit/LICENSE-grpc-common-spring-boot.txt
b/dist/licenses/other/mit/LICENSE-grpc-common-spring-boot.txt
similarity index 100%
rename from dist/licenses/mit/LICENSE-grpc-common-spring-boot.txt
rename to dist/licenses/other/mit/LICENSE-grpc-common-spring-boot.txt
diff --git
a/dist/licenses/mit/LICENSE-grpc-server-spring-boot-autoconfigure.txt
b/dist/licenses/other/mit/LICENSE-grpc-server-spring-boot-autoconfigure.txt
similarity index 100%
rename from dist/licenses/mit/LICENSE-grpc-server-spring-boot-autoconfigure.txt
rename to
dist/licenses/other/mit/LICENSE-grpc-server-spring-boot-autoconfigure.txt
diff --git a/dist/licenses/mit/LICENSE-grpc-server-spring-boot-starter.txt
b/dist/licenses/other/mit/LICENSE-grpc-server-spring-boot-starter.txt
similarity index 100%
rename from dist/licenses/mit/LICENSE-grpc-server-spring-boot-starter.txt
rename to dist/licenses/other/mit/LICENSE-grpc-server-spring-boot-starter.txt
diff --git a/dist/licenses/mit/LICENSE-grpc-spring-boot-starter.txt
b/dist/licenses/other/mit/LICENSE-grpc-spring-boot-starter.txt
similarity index 100%
rename from dist/licenses/mit/LICENSE-grpc-spring-boot-starter.txt
rename to dist/licenses/other/mit/LICENSE-grpc-spring-boot-starter.txt
diff --git a/ozhera-intelligence/ozhera-intelligence-server/pom.xml
b/ozhera-intelligence/ozhera-intelligence-server/pom.xml
index 02cdac4c..84b803a7 100644
--- a/ozhera-intelligence/ozhera-intelligence-server/pom.xml
+++ b/ozhera-intelligence/ozhera-intelligence-server/pom.xml
@@ -75,7 +75,7 @@
</configuration>
</plugin>
- <plugin>
+ <!-- <plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>2.7.15</version>
@@ -89,7 +89,7 @@
</goals>
</execution>
</executions>
- </plugin>
+ </plugin>-->
</plugins>
diff --git a/ozhera-log/log-agent/pom.xml b/ozhera-log/log-agent/pom.xml
index c74e8090..ef2abb2a 100644
--- a/ozhera-log/log-agent/pom.xml
+++ b/ozhera-log/log-agent/pom.xml
@@ -182,39 +182,6 @@ http://www.apache.org/licenses/LICENSE-2.0
</dependencies>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- <resource>
- <directory>${project.basedir}/../../</directory>
- <filtering>true</filtering>
- <includes>
- <include>DISCLAIMER</include>
- <include>NOTICE</include>
- <include>LICENSE</include>
- </includes>
- <targetPath>META-INF/</targetPath>
- </resource>
- </resources>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.11.0</version>
- <configuration>
- <compilerVersion>21</compilerVersion>
- <source>21</source>
- <target>21</target>
- </configuration>
- </plugin>
- </plugins>
-
- </build>
-
<profiles>
<profile>
<id>apache-release</id>
@@ -228,20 +195,42 @@ http://www.apache.org/licenses/LICENSE-2.0
<filters>
<filter>src/main/resources/config/open.properties</filter>
</filters>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <excludes>
+ <exclude>config/dev.properties</exclude>
+ </excludes>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>${project.basedir}/../../</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>DISCLAIMER</include>
+ <include>NOTICE</include>
+ <include>LICENSE</include>
+ </includes>
+ <targetPath>META-INF/</targetPath>
+ </resource>
+ </resources>
</build>
</profile>
<profile>
<id>dev</id>
- <properties>
- <profiles.active>dev</profiles.active>
- </properties>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<build>
<filters>
<filter>src/main/resources/config/dev.properties</filter>
</filters>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <excludes>
+ <exclude>config/open.properties</exclude>
+ </excludes>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
</build>
</profile>
diff --git a/sort.sh b/sort.sh
new file mode 100644
index 00000000..c501ce6d
--- /dev/null
+++ b/sort.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+f1="dist/f1.txt"
+f2="dist/f2.txt"
+
+f1out="dist/f1sort.txt"
+f2out="dist/f2sort.txt"
+
+
+sort -u $f1 -o $f1out
+echo "sort and uniq into $f1out"
+
+sort -u $f2 -o $f2out
+echo "sort and uniq into $f2out"
\ No newline at end of file
diff --git a/trace-etl/trace-etl-metadata/pom.xml
b/trace-etl/trace-etl-metadata/pom.xml
index a61fa745..6a91418f 100644
--- a/trace-etl/trace-etl-metadata/pom.xml
+++ b/trace-etl/trace-etl-metadata/pom.xml
@@ -69,7 +69,7 @@
</resource>
</resources>
- <plugins>
+ <!--<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
@@ -87,7 +87,7 @@
</executions>
</plugin>
- </plugins>
+ </plugins>-->
</build>
diff --git a/trace-etl/trace-etl-nginx/pom.xml
b/trace-etl/trace-etl-nginx/pom.xml
index 45a45f3a..00963989 100644
--- a/trace-etl/trace-etl-nginx/pom.xml
+++ b/trace-etl/trace-etl-nginx/pom.xml
@@ -74,7 +74,7 @@
</resource>
</resources>
- <plugins>
+ <!--<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
@@ -91,7 +91,7 @@
</executions>
</plugin>
- </plugins>
+ </plugins>-->
</build>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
