This is an automated email from the ASF dual-hosted git repository. gongchao pushed a commit to branch remove-avaitor in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
commit 38289de1bff2abf1e66da5320f1062891de23636 Author: tomsun28 <[email protected]> AuthorDate: Fri Apr 26 18:13:55 2024 +0800 remove Aviator update doc Signed-off-by: tomsun28 <[email protected]> --- README.md | 2 +- README_CN.md | 2 +- common/pom.xml | 1 - .../hertzbeat/common/util/JexlCommonFunction.java | 8 +- .../current/help/alert_threshold_expr.md | 2 +- material/licenses/backend/LICENSE | 11 +- material/licenses/backend/LICENSE-aviator.txt | 165 --------------------- pom.xml | 6 + 8 files changed, 14 insertions(+), 183 deletions(-) diff --git a/README.md b/README.md index 649ec2046..90589b164 100644 --- a/README.md +++ b/README.md @@ -466,7 +466,7 @@ WeChat Public : Search `Apache HertzBeat` or `usthecom`. HertzBeat is built on so many great open source projects, thanks to them! -- `Java Spring SpringBoot Jpa Maven Assembly Netty Lombok Sureness Aviator Protobuf HttpClient Guava SnakeYaml JsonPath ...` +- `Java Spring SpringBoot Jpa Maven Assembly Netty Lombok Sureness Protobuf HttpClient Guava SnakeYaml JsonPath ...` - `TypeScript Angular NG-ZORRO NG-ALAIN NodeJs Npm Html Less Echarts Rxjs ZoneJs MonacoEditor SlickCarousel Docusaurus ...` ## Landscape diff --git a/README_CN.md b/README_CN.md index a894b2098..b159b4039 100644 --- a/README_CN.md +++ b/README_CN.md @@ -466,7 +466,7 @@ Thanks these wonderful people, welcome to join us: HertzBeat is built on so many great open source projects, thanks to them! -- `Java Spring SpringBoot Jpa Maven Assembly Netty Lombok Sureness Aviator Protobuf HttpClient Guava SnakeYaml JsonPath ...` +- `Java Spring SpringBoot Jpa Maven Assembly Netty Lombok Sureness Protobuf HttpClient Guava SnakeYaml JsonPath ...` - `TypeScript Angular NG-ZORRO NG-ALAIN NodeJs Npm Html Less Echarts Rxjs ZoneJs MonacoEditor SlickCarousel Docusaurus ...` diff --git a/common/pom.xml b/common/pom.xml index 622083fe5..add11f7c3 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -119,7 +119,6 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-jexl3</artifactId> - <version>3.2.1</version> </dependency> <dependency> diff --git a/common/src/main/java/org/apache/hertzbeat/common/util/JexlCommonFunction.java b/common/src/main/java/org/apache/hertzbeat/common/util/JexlCommonFunction.java index 111214c91..b25c22c6e 100644 --- a/common/src/main/java/org/apache/hertzbeat/common/util/JexlCommonFunction.java +++ b/common/src/main/java/org/apache/hertzbeat/common/util/JexlCommonFunction.java @@ -21,7 +21,7 @@ public class JexlCommonFunction { /** - * Define a custom aviator string equality function + * Define a custom string equality function * @param left left * @param right right * @return true if equals @@ -37,7 +37,7 @@ public class JexlCommonFunction { } /** - * Custom aviator determines whether string 1 contains string 2 (case-insensitive) + * Custom determines whether string 1 contains string 2 (case-insensitive) * @param left left * @param right right * @return true if contains @@ -51,7 +51,7 @@ public class JexlCommonFunction { /** - * Custom aviator determines if a value exists for this object in the environment + * Custom determines if a value exists for this object in the environment * @param arg arg * @return true if exists */ @@ -63,7 +63,7 @@ public class JexlCommonFunction { } /** - * Custom aviator determines if a string matches a regex + * Custom determines if a string matches a regex * - regex You need to add "" or '' * @param str str * @param regex regex diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/alert_threshold_expr.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/alert_threshold_expr.md index 14fbcdb13..f7c8316c7 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/alert_threshold_expr.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/alert_threshold_expr.md @@ -28,7 +28,7 @@ equals(str1,str2) #### 表达式函数库列表 -参考: https://www.yuque.com/boyan-avfmj/aviatorscript/ashevw +todo #### 支持的环境变量 > 环境变量即指标值等支持的变量，用于在表达式中，阈值计算判断时会将变量替换成实际值进行计算 diff --git a/material/licenses/backend/LICENSE b/material/licenses/backend/LICENSE index 0116e2fc6..963e21187 100644 --- a/material/licenses/backend/LICENSE +++ b/material/licenses/backend/LICENSE @@ -409,6 +409,7 @@ The text of each license is the standard Apache 2.0 license. https://mvnrepository.com/artifact/com.github.GreptimeTeam/greptime-proto/0.4.0 https://mvnrepository.com/artifact/org.webjars/swagger-ui/5.10.3 https://mvnrepository.com/artifact/com.google.flatbuffers/flatbuffers-java/1.12.0 + https://mvnrepository.com/artifact/org.apache.commons/commons-jexl3/3.2.1 ======================================================================== @@ -527,13 +528,3 @@ The following components are provided under the https://spdx.org/licenses/MIT-0. The text of each license is also included in licenses/LICENSE-[project].txt. https://mvnrepository.com/artifact/org.reactivestreams/reactive-streams/1.0.4 https://spdx.org/licenses/MIT-0.html - - -======================================================================== -LGPL-2.1 licenses -======================================================================== -The following components are provided under the LGPL-2.1 License. See project link for details. -The text of each license is also included in licenses/LICENSE-[project].txt. - - https://mvnrepository.com/artifact/com.googlecode.aviator/aviator/5.4.1 http://www.gnu.org/licenses/lgpl.html - diff --git a/material/licenses/backend/LICENSE-aviator.txt b/material/licenses/backend/LICENSE-aviator.txt deleted file mode 100644 index 02bbb60bc..000000000 --- a/material/licenses/backend/LICENSE-aviator.txt +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. \ No newline at end of file diff --git a/pom.xml b/pom.xml index 2cf13ea1b..cfb442ab2 100644 --- a/pom.xml +++ b/pom.xml @@ -133,6 +133,7 @@ <taos-jdbcdriver.version>3.0.0</taos-jdbcdriver.version> <iotdb-session.version>0.13.3</iotdb-session.version> <commons-collections4.version>4.4</commons-collections4.version> + <commons-jexl3>3.2.1</commons-jexl3> <commons-net>3.10.0</commons-net> </properties> @@ -228,6 +229,11 @@ <artifactId>httpclient</artifactId> <version>${httpclient.version}</version> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-jexl3</artifactId> + <version>${commons-jexl3}</version> + </dependency> <!-- mysql --> <dependency> <groupId>mysql</groupId> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
