This is an automated email from the ASF dual-hosted git repository.
gaoxihui pushed a commit to branch release-2.2.5-incubating-rc2-dev
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-dev by this push:
new 812cd2d1 feat: add third-party dependency package declaration
812cd2d1 is described below
commit 812cd2d11ca8678d6e9e8b8afe513e46847392ee
Author: gaoxihui <[email protected]>
AuthorDate: Fri Feb 21 23:41:24 2025 +0800
feat: add third-party dependency package declaration
---
dist/LICENSE | 3 -
dist/NOTICE | 201 +++++++++++++++++++++
ozhera-log/log-common/pom.xml | 4 +-
ozhera-operator/ozhera-operator-server/pom.xml | 10 +-
.../ozhera-prometheus-agent-dao/pom.xml | 6 +
ozhera-webhook/pom.xml | 4 +-
6 files changed, 219 insertions(+), 9 deletions(-)
diff --git a/dist/LICENSE b/dist/LICENSE
index aa1cda60..3fe52eaa 100644
--- a/dist/LICENSE
+++ b/dist/LICENSE
@@ -356,7 +356,6 @@ See licenses/ for text of these licenses.
(Apache License, Version 2.0) Netty/Transport/RXTX
(io.netty:netty-transport-rxtx:4.1.97.Final -
https://netty.io/netty-transport-rxtx/)
(Apache License, Version 2.0) Netty/Transport/SCTP
(io.netty:netty-transport-sctp:4.1.97.Final -
https://netty.io/netty-transport-sctp/)
(Apache License, Version 2.0) Netty/Transport/UDT
(io.netty:netty-transport-udt:4.1.97.Final -
https://netty.io/netty-transport-udt/)
- (Apache License, Version 2.0) Nutz (org.nutz:nutz:1.r.68.v20191031 -
http://nutzam.com)
(Apache License, Version 2.0) Nutz (run.mone:nutz:1.r.68-open -
http://nutzam.com)
(Apache License, Version 2.0) Objenesis (org.objenesis:objenesis:3.2 -
http://objenesis.org/objenesis)
(Apache License, Version 2.0) OkHttp Logging Interceptor
(com.squareup.okhttp3:logging-interceptor:3.12.12 -
https://github.com/square/okhttp/logging-interceptor)
@@ -553,8 +552,6 @@ See licenses/ for text of these licenses.
(The 3-Clause BSD License) Chinese to Pinyin (com.belerweb:pinyin4j:2.5.1
- https://github.com/belerweb/pinyin4j)
(The 3-Clause BSD License) Hamcrest Core (org.hamcrest:hamcrest-core:1.3
- https://github.com/hamcrest/JavaHamcrest/hamcrest-core)
(The 3-Clause BSD License) commons-compiler
(org.codehaus.janino:commons-compiler:3.0.8 -
http://janino-compiler.github.io/commons-compiler/)
- (The 3-Clause BSD License) hyperscan-java
(com.gliwka.hyperscan:hyperscan:5.4.0-2.0.0 -
https://github.com/gliwka/hyperscan-java)
- (The 3-Clause BSD License) hyperscan-java-native
(com.gliwka.hyperscan:native:5.4.0-1.0.0 -
https://github.com/gliwka/hyperscan-java-native)
(The 3-Clause BSD License) janino (org.codehaus.janino:janino:3.0.8 -
http://janino-compiler.github.io/janino/)
=========================================================================================
diff --git a/dist/NOTICE b/dist/NOTICE
index d22f970f..0aa1d693 100644
--- a/dist/NOTICE
+++ b/dist/NOTICE
@@ -1660,3 +1660,204 @@ Copyright 2015-2018 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+
+-------------------------- junit-jupiter NOTICE --------------------------
+Open Source Licenses
+====================
+
+This product may include a number of subcomponents with separate
+copyright notices and license terms. Your use of the source code for
+these subcomponents is subject to the terms and conditions of the
+subcomponent's license, as noted in the LICENSE-<subcomponent>.md
+files.
+
+-------------------------- junit-jupiter-api NOTICE --------------------------
+Open Source Licenses
+====================
+
+This product may include a number of subcomponents with separate
+copyright notices and license terms. Your use of the source code for
+these subcomponents is subject to the terms and conditions of the
+subcomponent's license, as noted in the LICENSE-<subcomponent>.md
+files.
+
+-------------------------- junit-jupiter-engine NOTICE
--------------------------
+Open Source Licenses
+====================
+
+This product may include a number of subcomponents with separate
+copyright notices and license terms. Your use of the source code for
+these subcomponents is subject to the terms and conditions of the
+subcomponent's license, as noted in the LICENSE-<subcomponent>.md
+files.
+
+-------------------------- junit-jupiter-params NOTICE
--------------------------
+Open Source Licenses
+====================
+
+This product may include a number of subcomponents with separate
+copyright notices and license terms. Your use of the source code for
+these subcomponents is subject to the terms and conditions of the
+subcomponent's license, as noted in the LICENSE-<subcomponent>.md
+files.
+
+-------------------------- junit-platform-commons NOTICE
--------------------------
+Open Source Licenses
+====================
+
+This product may include a number of subcomponents with separate
+copyright notices and license terms. Your use of the source code for
+these subcomponents is subject to the terms and conditions of the
+subcomponent's license, as noted in the LICENSE-<subcomponent>.md
+files.
+
+
+-------------------------- junit-platform-engine NOTICE
--------------------------
+Open Source Licenses
+====================
+
+This product may include a number of subcomponents with separate
+copyright notices and license terms. Your use of the source code for
+these subcomponents is subject to the terms and conditions of the
+subcomponent's license, as noted in the LICENSE-<subcomponent>.md
+files.
+
+
+-------------------------- mybatis-generator-core NOTICE
--------------------------
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+This product includes the EqualsUtil and HashCodeUtil classes
+from http://www.javapractices.com.
+
+
+MyBatis Spring
+Copyright 2010-2013
+
+This product includes software developed by
+The MyBatis Team (http://www.mybatis.org/).
+
+
+-------------------------- mybatis-generator-core NOTICE
--------------------------
+iBATIS
+ This product includes software developed by
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Copyright 2010 The Apache Software Foundation
+
+ 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.
+
+Spring Framework
+ All Spring projects are licensed under the terms of the Apache License,
Version 2.0
+
+ Copyright 2002-2010 the original author or 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.
+
+-------------------------- objenesis NOTICE --------------------------
+ // ------------------------------------------------------------------
+ // NOTICE file corresponding to the section 4d of The Apache License,
+ // Version 2.0, in this case for Objenesis
+ // ------------------------------------------------------------------
+
+ Objenesis
+ Copyright 2006-2021 Joe Walnes, Henri Tremblay, Leonardo Mesquita
+
+-------------------------- Spring-Framework NOTICE --------------------------
+Spring Framework 5.3.29
+Copyright (c) 2002-2023 Pivotal, Inc.
+
+This product is licensed to you under the Apache License, Version 2.0
+(the "License"). You may not use this product except in compliance with
+the License.
+
+This product may include a number of subcomponents with separate
+copyright notices and license terms. Your use of the source code for
+these subcomponents is subject to the terms and conditions of the
+subcomponent's license, as noted in the license.txt file.
+
+-------------------------- spring-boot NOTICE --------------------------
+Spring Boot 2.7.15
+Copyright (c) 2012-2023 VMware, Inc.
+
+This product is licensed to you under the Apache License, Version 2.0
+(the "License"). You may not use this product except in compliance with
+the License.
+
+-------------------------- spring-data-commons NOTICE
--------------------------
+Spring Data Commons 2.7.15 (2021.2.15)
+Copyright (c) [2010-2021] Pivotal Software, Inc.
+
+This product is licensed to you under the Apache License, Version 2.0 (the
"License").
+You may not use this product except in compliance with the License.
+
+This product may include a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the subcomponent's license, as noted in the LICENSE file.
+
+
+-------------------------- spring-data-keyvalue NOTICE
--------------------------
+Spring Data KeyValue 2.7.15 (2021.2.15)
+Copyright (c) 2015-2019 Pivotal Software, Inc.
+
+This product is licensed to you under the Apache License, Version 2.0
+(the "License"). You may not use this product except in compliance with
+the License.
+
+This product may include a number of subcomponents with separate
+copyright notices and license terms. Your use of the source code for
+these subcomponents is subject to the terms and conditions of the
+subcomponent's license, as noted in the license.txt file.
+
+-------------------------- spring-data-redis NOTICE --------------------------
+Spring Data Redis 2.7.15 (2021.2.15)
+Copyright (c) [2010-2019] Pivotal Software, Inc.
+
+This product is licensed to you under the Apache License, Version 2.0 (the
"License").
+You may not use this product except in compliance with the License.
+
+This product may include a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the subcomponent's license, as noted in the LICENSE file.
+
+
+-------------------------- snappy-java NOTICE --------------------------
+This product includes software developed by Google
+ Snappy: http://code.google.com/p/snappy/ (New BSD License)
+
+This product includes software developed by Apache
+ PureJavaCrc32C from apache-hadoop-common http://hadoop.apache.org/
+ (Apache 2.0 license)
+
+This library containd statically linked libstdc++. This inclusion is allowed by
+"GCC RUntime Library Exception"
+http://gcc.gnu.org/onlinedocs/libstdc++/manual/license.html
+
+== Contributors ==
+ * Tatu Saloranta
+ * Providing benchmark suite
+ * Alec Wysoker
+ * Performance and memory usage improvement
+
diff --git a/ozhera-log/log-common/pom.xml b/ozhera-log/log-common/pom.xml
index 262cf3e1..a262dc03 100644
--- a/ozhera-log/log-common/pom.xml
+++ b/ozhera-log/log-common/pom.xml
@@ -56,11 +56,11 @@ http://www.apache.org/licenses/LICENSE-2.0
<scope>compile</scope>
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>com.gliwka.hyperscan</groupId>
<artifactId>hyperscan</artifactId>
<version>5.4.0-2.0.0</version>
- </dependency>
+ </dependency>-->
<dependency>
<groupId>com.google.code.gson</groupId>
diff --git a/ozhera-operator/ozhera-operator-server/pom.xml
b/ozhera-operator/ozhera-operator-server/pom.xml
index 9385f756..b9dfe395 100644
--- a/ozhera-operator/ozhera-operator-server/pom.xml
+++ b/ozhera-operator/ozhera-operator-server/pom.xml
@@ -38,6 +38,12 @@ http://www.apache.org/licenses/LICENSE-2.0
<dependency>
<groupId>run.mone</groupId>
<artifactId>docean-plugin-k8s</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>snakeyaml</artifactId>
+ <groupId>org.yaml</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -58,7 +64,7 @@ http://www.apache.org/licenses/LICENSE-2.0
</dependency>
</dependencies>
- <dependencyManagement>
+ <!--<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.yaml</groupId>
@@ -66,7 +72,7 @@ http://www.apache.org/licenses/LICENSE-2.0
<version>1.33</version>
</dependency>
</dependencies>
- </dependencyManagement>
+ </dependencyManagement>-->
<build>
diff --git a/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/pom.xml
b/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/pom.xml
index 378ba5f8..3dc8e46a 100644
--- a/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/pom.xml
+++ b/ozhera-prometheus-agent/ozhera-prometheus-agent-dao/pom.xml
@@ -46,6 +46,12 @@
<dependency>
<groupId>org.nutz</groupId>
<artifactId>nutz-integration-spring</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>nutz</artifactId>
+ <groupId>org.nutz</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/ozhera-webhook/pom.xml b/ozhera-webhook/pom.xml
index a151ca1e..ac28f028 100644
--- a/ozhera-webhook/pom.xml
+++ b/ozhera-webhook/pom.xml
@@ -79,11 +79,11 @@
<version>1.0.10-mone</version>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.30</version>
- </dependency>
+ </dependency>-->
</dependencies>
</dependencyManagement>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
