From 9e1a460dc7e075f8982e7cead55b2b00babce642 Mon Sep 17 00:00:00 2001 From: Logic Date: Mon, 9 Mar 2026 23:34:15 +0800 Subject: [PATCH] refactor: update to Springboot4 and Hibernate 7 (#4057) Co-authored-by: lynx009 <2030509072@qq.com> --- .gitpod.Dockerfile | 4 +- CONTRIBUTING.md | 4 +- README.md | 2 +- README_CN.md | 2 +- README_JP.md | 30 +- hertzbeat-ai/pom.xml | 7 +- .../ai/controller/ChatController.java | 2 +- .../ai/sop/registry/SkillRegistry.java | 6 +- .../ai/sop/registry/SopYamlLoader.java | 10 +- .../ai/tools/impl/AlertDefineToolsImpl.java | 58 +- .../hertzbeat/ai/utils/UtilityClass.java | 12 +- hertzbeat-alerter/pom.xml | 5 + .../WindowedLogRealTimeAlertCalculator.java | 20 +- .../realtime/window/TimeService.java | 48 +- .../realtime/window/WindowAggregator.java | 60 +- .../impl/EmailAlertNotifyHandlerImpl.java | 15 +- .../impl/FeiShuAppAlertNotifyHandlerImpl.java | 15 +- .../alert/service/SmsClientFactory.java | 8 +- .../AlertDefineExcelImExportServiceImpl.java | 2 +- .../AlertDefineJsonImExportServiceImpl.java | 25 +- .../service/impl/AlertDefineServiceImpl.java | 16 +- .../AlibabaCloudSlsExternAlertService.java | 4 +- .../service/impl/AlibabaSmsClientImpl.java | 8 +- .../alert/service/impl/AwsSmsClientImpl.java | 8 +- .../impl/HuaweiCloudExternAlertService.java | 4 +- .../impl/PrometheusExternAlertService.java | 4 +- .../impl/SkyWalkingExternAlertService.java | 4 +- .../service/impl/SmsLocalSmsClientImpl.java | 2 +- .../service/impl/TencentSmsClientImpl.java | 16 +- .../service/impl/TwilioSmsClientImpl.java | 2 +- .../alert/service/impl/UniSmsClientImpl.java | 34 +- .../impl/VolcEngineExternAlertService.java | 12 +- .../impl/EmailAlertNotifyHandlerImplTest.java | 42 +- .../AlertDefineJsonImExportServiceTest.java | 75 +-- .../alert/service/SmsClientFactoryTest.java | 8 +- .../collect/push/PushCollectImpl.java | 2 +- .../collect/sd/HttpSdCollectImpl.java | 2 +- .../collector/util/CollectUtilTest.java | 24 +- .../hertzbeat-collector-common/pom.xml | 6 +- .../processor/DeleteCyclicTaskProcessor.java | 4 +- .../hertzbeat/collector/util/CollectUtil.java | 2 +- hertzbeat-collector/pom.xml | 2 +- hertzbeat-common-core/pom.xml | 20 +- .../common/entity/dto/PromVectorOrMatrix.java | 29 +- .../sd/EurekaDiscoveryResponseEntity.java | 7 +- .../serialize/KafkaLogEntryDeserializer.java | 22 +- .../serialize/KafkaLogEntrySerializer.java | 20 +- .../common/serialize/RedisLogEntryCodec.java | 30 +- .../common/util/JexlExpressionRunner.java | 10 +- .../hertzbeat/common/util/JsonUtil.java | 114 +++- .../apache/hertzbeat/common/util/XmlUtil.java | 77 +++ .../hertzbeat/common/util/JsonUtilTest.java | 6 +- hertzbeat-common-spring/pom.xml | 18 +- .../common/config/EclipseLinkCustomizer.java | 68 -- .../config/EclipseLinkJpaConfiguration.java | 61 -- .../common/entity/ai/ChatConversation.java | 6 +- .../common/entity/ai/ChatMessage.java | 10 +- .../alerter/JsonMapAttributeConverter.java | 2 +- .../JsonByteListAttributeConverter.java | 2 +- .../JsonLongListAttributeConverter.java | 2 +- .../JsonMapListAttributeConverter.java | 2 +- .../JsonOptionListAttributeConverter.java | 2 +- .../JsonStringListAttributeConverter.java | 2 +- .../apache/hertzbeat/common/util/XmlUtil.java | 78 --- .../collect/AbstractCollectE2eTest.java | 3 +- hertzbeat-e2e/hertzbeat-log-e2e/pom.xml | 7 +- .../log/alert/LogPeriodicAlertE2eTest.java | 48 +- .../log/alert/LogRealTimeAlertE2eTest.java | 20 +- .../log/ingestion/LogIngestionE2eTest.java | 7 +- .../storage/GreptimeLogStorageE2eTest.java | 47 +- .../src/test/resources/vector.yml | 15 +- hertzbeat-grafana/pom.xml | 5 + .../grafana/service/DashboardService.java | 10 +- .../service/ServiceAccountService.java | 2 +- hertzbeat-manager/pom.xml | 10 +- .../SurenessJakartaServletFilter.java | 147 ++++ .../component/listener/TimeZoneListener.java | 47 -- .../validator/impl/JsonParamValidator.java | 2 +- .../config/AngularErrorViewResolver.java | 2 +- .../manager/config/ConfigInitializer.java | 29 +- .../manager/config/FlywayConfiguration.java | 22 +- .../manager/config/JacksonConfig.java | 37 +- .../manager/config/RestTemplateConfig.java | 37 +- .../AbstractGeneralConfigServiceImpl.java | 59 +- .../manager/service/impl/AppServiceImpl.java | 279 +++----- .../impl/ExcelImExportServiceImpl.java | 4 +- .../service/impl/JsonImExportServiceImpl.java | 33 +- .../impl/MailGeneralConfigServiceImpl.java | 19 +- .../impl/ModelProviderConfigServiceImpl.java | 18 +- .../impl/MuteGeneralConfigServiceImpl.java | 13 +- .../impl/ObjectStoreConfigServiceImpl.java | 20 +- .../service/impl/PluginServiceImpl.java | 2 +- .../impl/SmsGeneralConfigServiceImpl.java | 19 +- .../impl/SystemGeneralConfigServiceImpl.java | 22 +- .../service/impl/SystemSecretServiceImpl.java | 18 +- .../impl/TemplateConfigServiceImpl.java | 22 +- .../support/GlobalExceptionHandler.java | 4 +- .../listener/TimeZoneListenerTest.java | 75 --- .../GeneralConfigControllerTest.java | 2 +- .../controller/StatusPageControllerTest.java | 4 +- .../service/JsonImExportServiceTest.java | 70 +- .../service/MailGeneralConfigServiceTest.java | 12 +- .../service/ObjectStoreConfigServiceTest.java | 18 +- .../service/SmsGeneralConfigServiceTest.java | 18 +- .../SystemGeneralConfigServiceTest.java | 16 +- .../service/SystemSecretServiceTest.java | 14 +- .../service/TemplateConfigServiceTest.java | 12 +- hertzbeat-startup/pom.xml | 14 +- .../startup/HertzBeatApplication.java | 4 +- .../src/main/resources/application-test.yml | 9 +- .../src/main/resources/application.yml | 17 +- .../apache/hertzbeat/startup/ContextTest.java | 4 +- .../startup/dao/CollectorDaoTest.java | 2 +- .../startup/dao/MetricsFavoriteDaoTest.java | 11 + .../startup/dao/NoticeRuleDaoTest.java | 3 +- .../db/GreptimeSqlQueryExecutor.java | 5 +- .../tsdb/doris/DorisStreamLoadWriter.java | 2 +- .../greptime/GreptimeSqlQueryContent.java | 8 +- .../vm/VictoriaMetricsClusterDataStorage.java | 2 +- .../service/WarehouseServiceTest.java | 7 +- home/docs/community/contribution.md | 2 +- home/docs/community/development.md | 8 +- home/docs/community/how-to-release.md | 2 +- home/docs/download.md | 6 +- home/docs/help/risc-v.md | 8 +- home/docs/start/mysql-change.md | 18 +- home/docs/start/package-deploy.md | 26 +- home/docs/start/postgresql-change.md | 18 +- home/docs/start/quickstart.md | 4 +- .../current/community/contribution.md | 2 +- .../current/community/development.md | 8 +- .../current/community/how-to-release.md | 2 +- .../current/download.md | 6 +- .../current/help/risc-v.md | 8 +- .../current/start/mysql-change.md | 18 +- .../current/start/package-deploy.md | 37 +- .../current/start/postgresql-change.md | 24 +- .../current/start/quickstart.md | 4 +- home/src/components/StructuredData.js | 2 +- home/src/pages/faq.js | 2 +- home/src/pages/zh-cn/faq.js | 2 +- home/static/llms-zh.txt | 2 +- home/static/llms.txt | 2 +- material/licenses/LICENSE | 6 +- material/licenses/backend/LICENSE | 5 - .../licenses/backend/LICENSE-eclipselink.txt | 637 ------------------ .../LICENSE-org.eclipse.persistence.asm.txt | 637 ------------------ .../LICENSE-org.eclipse.persistence.core.txt | 637 ------------------ .../LICENSE-org.eclipse.persistence.jpa.txt | 637 ------------------ .../LICENSE-org.eclipse.persistence.jpql.txt | 637 ------------------ .../LICENSE-org.eclipse.persistence.txt | 637 ------------------ .../LICENSE-org.eclipse.persistence.asm.txt | 637 ------------------ .../LICENSE-org.eclipse.persistence.core.txt | 637 ------------------ .../LICENSE-org.eclipse.persistence.jpa.txt | 637 ------------------ .../LICENSE-org.eclipse.persistence.jpql.txt | 637 ------------------ .../LICENSE-org.eclipse.persistence.txt | 637 ------------------ pom.xml | 59 +- script/application.yml | 49 +- script/assembly/collector/bin/startup.sh | 2 +- script/assembly/server/bin/startup.sh | 2 +- .../ci/github-actions/setup-deps/action.yml | 4 +- .../conf/application.yml | 9 +- .../conf/application.yml | 9 +- .../conf/application.yml | 9 +- .../conf/application.yml | 9 +- .../conf/application.yml | 9 +- 166 files changed, 1343 insertions(+), 8609 deletions(-) create mode 100644 hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/XmlUtil.java delete mode 100644 hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/config/EclipseLinkCustomizer.java delete mode 100644 hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/config/EclipseLinkJpaConfiguration.java delete mode 100644 hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/util/XmlUtil.java create mode 100644 hertzbeat-manager/src/main/java/com/usthe/sureness/configuration/SurenessJakartaServletFilter.java delete mode 100644 hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/component/listener/TimeZoneListener.java delete mode 100644 hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/component/listener/TimeZoneListenerTest.java delete mode 100644 material/licenses/backend/LICENSE-eclipselink.txt delete mode 100644 material/licenses/backend/LICENSE-org.eclipse.persistence.asm.txt delete mode 100644 material/licenses/backend/LICENSE-org.eclipse.persistence.core.txt delete mode 100644 material/licenses/backend/LICENSE-org.eclipse.persistence.jpa.txt delete mode 100644 material/licenses/backend/LICENSE-org.eclipse.persistence.jpql.txt delete mode 100644 material/licenses/backend/LICENSE-org.eclipse.persistence.txt delete mode 100644 material/licenses/collector/LICENSE-org.eclipse.persistence.asm.txt delete mode 100644 material/licenses/collector/LICENSE-org.eclipse.persistence.core.txt delete mode 100644 material/licenses/collector/LICENSE-org.eclipse.persistence.jpa.txt delete mode 100644 material/licenses/collector/LICENSE-org.eclipse.persistence.jpql.txt delete mode 100644 material/licenses/collector/LICENSE-org.eclipse.persistence.txt diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile index 3c1edd3c60..4c8f464d9a 100644 --- a/.gitpod.Dockerfile +++ b/.gitpod.Dockerfile @@ -3,5 +3,5 @@ FROM gitpod/workspace-full USER gitpod RUN bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh && \ - sdk install java 17.0.3-ms && \ - sdk default java 17.0.3-ms" + sdk install java 21.0.2-tem && \ + sdk default java 21.0.2-tem" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index de37f12440..1a1738267c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -32,7 +32,7 @@ Even small corrections to typos are very welcome :) #### Backend start -1. Requires `maven3+`, `java17` and `lombok` environments +1. Requires `maven3+`, `java21` and `lombok` environments 2. (Optional) Modify the configuration file: `hertzbeat-startup/src/main/resources/application.yml` @@ -172,7 +172,7 @@ Add WeChat account `ahertzbeat` to pull you into the WeChat group. #### 后端启动 -1. 需要 `maven3+`, `java17` 和 `lombok` 环境 +1. 需要 `maven3+`, `java21` 和 `lombok` 环境 2. (可选)修改配置文件配置信息-`hertzbeat-startup/src/main/resources/application.yml` diff --git a/README.md b/README.md index f5d51c43a7..0d8cff96a6 100644 --- a/README.md +++ b/README.md @@ -156,7 +156,7 @@ Detailed config refer to [Install HertzBeat via Package](https://hertzbeat.apach ##### 3：Start via source code 1. Local source code debugging needs to start the back-end project `hertzbeat-startup` and the front-end project `web-app`. -2. Backend：need `maven3+`, `java17`, `lombok`, add VM options in IDE: ` --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED `, then start the `hertzbeat-startup` service. +2. Backend：need `maven3+`, `java21`, `lombok`, add VM options in IDE: ` --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED `, then start the `hertzbeat-startup` service. 3. Web：need `nodejs npm angular-cli` environment, Run `ng serve --open` in `web-app` directory after backend startup. 4. Access `http://localhost:4200` to start, default account: `admin/hertzbeat` diff --git a/README_CN.md b/README_CN.md index 56067fa3c9..7393ace701 100644 --- a/README_CN.md +++ b/README_CN.md @@ -153,7 +153,7 @@ ##### 方式三：本地代码启动 1. 此为前后端分离项目，本地代码调试需要分别启动后端工程 `hertzbeat-startup` 和前端工程 `web-app` -2. 后端：需要 `maven3+`, `java17` 和 `lombok` 环境，修改 `YML` 配置信息，添加JVM参数`--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED`后启动 `hertzbeat-startup` 服务即可。 +2. 后端：需要 `maven3+`, `java21` 和 `lombok` 环境，修改 `YML` 配置信息，添加JVM参数`--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED`后启动 `hertzbeat-startup` 服务即可。 3. 前端：需要 `nodejs npm angular-cli`环境，待本地后端启动后，在 `web-app` 目录下启动 `ng serve --open` 4. 浏览器访问 `http://localhost:4200` 即可开始，默认账号密码 `admin/hertzbeat` diff --git a/README_JP.md b/README_JP.md index 535f726013..13c49de6a4 100644 --- a/README_JP.md +++ b/README_JP.md @@ -7,7 +7,7 @@

Readme: English | 中文 | 日本語 -

+

[![Discord](https://img.shields.io/badge/Chat-Discord-7289DA?logo=discord)](https://discord.gg/Fb6M73htGr) [![Reddit](https://img.shields.io/badge/Reddit-Community-7289DA?logo=reddit)](https://www.reddit.com/r/hertzbeat/) @@ -20,13 +20,13 @@ [![Contribute with Gitpod](https://img.shields.io/badge/Contribute%20with-Gitpod-908a85?logo=gitpod&color=green)](https://gitpod.io/#https://github.com/apache/hertzbeat) -**公式サイト: [hertzbeat.apache.org](https://hertzbeat.apache.org)** +**公式サイト: [hertzbeat.apache.org](https://hertzbeat.apache.org)** **メール:**　メーリングリストに登録するために、dev-subscribe@hertzbeat.apache.orgにメールを送ってください。 ## 🎡 紹介 -[Apache HertzBeat™](https://github.com/apache/hertzbeat) は AI 駆動の次世代オープンソースリアルタイム観測システムです。メトリクスとログの統一収集、アラートの一元配信、インテリジェント管理分析。エージェント不要、高性能クラスタ、強力なカスタム監視とステータスページ構築機能を提供します。 +[Apache HertzBeat™](https://github.com/apache/hertzbeat) は AI 駆動の次世代オープンソースリアルタイム観測システムです。メトリクスとログの統一収集、アラートの一元配信、インテリジェント管理分析。エージェント不要、高性能クラスタ、強力なカスタム監視とステータスページ構築機能を提供します。 ### 特性 @@ -39,19 +39,19 @@ - 高性能で、コレクタークラスタの水平拡張、マルチ分離ネットワーク監視、クラウドエッジ協調をサポート。 - 強力なステータスページ構築機能を提供し、サービスのリアルタイムステータスをユーザーに簡単に伝達。 -> `HertzBeat`の統一プラットフォーム、AI インテリジェンス、強力なカスタマイズ、多種類サポート、高性能、容易な拡張性は、ユーザーが迅速かつ便利に観測要件を実現することを支援することを目的としています。 +> `HertzBeat`の統一プラットフォーム、AI インテリジェンス、強力なカスタマイズ、多種類サポート、高性能、容易な拡張性は、ユーザーが迅速かつ便利に観測要件を実現することを支援することを目的としています。 ---- ---- -## 🥐 モジュール +## 🥐 モジュール -![hertzBeat](home/static/img/docs/hertzbeat-arch.png) +![hertzBeat](home/static/img/docs/hertzbeat-arch.png) -## ⛄ 利用可能 +## ⛄ 利用可能 -> `mysql`、`Java仮想マシン`、`k8s` などのすべての監視コレクション タイプを `YML` 監視テンプレートとして定義し、ユーザーがそれらをインポートして対応するタイプの監視をサポートできるようにしています。 +> `mysql`、`Java仮想マシン`、`k8s` などのすべての監視コレクション タイプを `YML` 監視テンプレートとして定義し、ユーザーがそれらをインポートして対応するタイプの監視をサポートできるようにしています。 > カスタマイズされた一般的なモニターのテンプレートを提供することを歓迎します。 - [Website](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-website.yml), [Port Telnet](https://raw.githubusercontent.com/apache/hertzbeat/master/hertzbeat-manager/src/main/resources/define/app-port.yml), @@ -93,7 +93,7 @@ - その他、カスタマイズされたモニターテンプレート。 - 通知利用可能 `Discord` `Slack` `Telegram` `Email` `Dingtalk` `WeChat` `FeiShu` `Webhook` `SMS` `ServerChan`。 -## 🐕 クイックスタート +## 🐕 クイックスタート - HertzBeat をローカルに展開する場合は、以下のデプロイメントドキュメントを参照してください。 @@ -102,7 +102,7 @@ ##### 方式１：Docker -1. `docker` で以下の指令を実行します： +1. `docker` で以下の指令を実行します： ```shell docker run -d -p 1157:1157 -p 1158:1158 --name hertzbeat apache/hertzbeat @@ -156,7 +156,7 @@ ##### 方式３：ローカルの実行 1. ローカルの実行には、バックエンドのプロジェクト`hertzbeat-startup`とフロントエンドのプロジェクト`web-app`を起動する必要があります。 -2. バックエンド：`maven3+`、`java17`と`lombok`の環境は必要です。`YML` 設定を修正し、Java仮想マシンパラメータに`--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED` を追加し、`hertzbeat-startup` を起動します。 +2. バックエンド：`maven3+`、`Java21`と`lombok`の環境は必要です。`YML` 設定を修正し、Java仮想マシンパラメータに`--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED` を追加し、`hertzbeat-startup` を起動します。 3. フロントエンド：`nodejs npm angular-cli`の環境は必要です。ローカルのバックエンドが立ち上がったら、`web-app` ディレクトリで `ng serve --open` というコマンドを実行します。 4. スタート：`http://localhost:4200`にアクセスします。デフォルトのアカウントとパスワード：`admin/hertzbeat`。 @@ -166,7 +166,7 @@ [Docker-Compose 部署脚本](script/docker-compose)でpostgresql/mysqlデータベース、victoria-metrics、iotdb、またはtdengine時系列データベースとHertzbeat一括デプロイ。 -詳細ステップ [通过 Docker-Compose 安装 HertzBeat](script/docker-compose/README.md) +詳細ステップ [通过 Docker-Compose 安装 HertzBeat](script/docker-compose/README.md) ##### 方式５：Kubernetes Helm Charts @@ -178,8 +178,8 @@ Helm ChartでHertzBeatクラスタコンポーネントをKubernetesクラスタ ## ✨ Contributors -Thanks these wonderful people, welcome to join us: -[貢献ガイド](CONTRIBUTING.md) +Thanks these wonderful people, welcome to join us: +[貢献ガイド](CONTRIBUTING.md) @@ -557,7 +557,7 @@ Thanks these wonderful people, welcome to join us: - + ## 💬 コミュニティ交流 diff --git a/hertzbeat-ai/pom.xml b/hertzbeat-ai/pom.xml index 7b30cf9ebf..2b9298b6b5 100644 --- a/hertzbeat-ai/pom.xml +++ b/hertzbeat-ai/pom.xml @@ -27,7 +27,7 @@ ${hertzbeat.version} 1.1.1 - 17 + 21 @@ -78,10 +78,7 @@ com.usthe.sureness spring-boot3-starter-sureness - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - + diff --git a/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/controller/ChatController.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/controller/ChatController.java index 71c5d47cb5..ff2dc19cbd 100644 --- a/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/controller/ChatController.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/controller/ChatController.java @@ -41,7 +41,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import reactor.core.publisher.Flux; -import javax.validation.Valid; +import jakarta.validation.Valid; import java.util.List; import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; diff --git a/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/sop/registry/SkillRegistry.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/sop/registry/SkillRegistry.java index f3301f709f..ec508c42fe 100644 --- a/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/sop/registry/SkillRegistry.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/sop/registry/SkillRegistry.java @@ -26,7 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Service; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -92,12 +92,12 @@ public class SkillRegistry implements ToolCallbackProvider { @Override public ToolCallback[] getToolCallbacks() { List callbacks = new ArrayList<>(); - + for (SopDefinition skill : skillMap.values()) { log.debug("Registering SOP as tool: {}", skill.getName()); callbacks.add(new SopToolCallback(skill, sopEngine)); } - + return callbacks.toArray(new ToolCallback[0]); } } diff --git a/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/sop/registry/SopYamlLoader.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/sop/registry/SopYamlLoader.java index 9b773dd97a..7e37e8f830 100644 --- a/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/sop/registry/SopYamlLoader.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/sop/registry/SopYamlLoader.java @@ -17,8 +17,7 @@ package org.apache.hertzbeat.ai.sop.registry; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; +import tools.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.ai.sop.model.SopDefinition; import org.springframework.core.io.Resource; @@ -28,6 +27,7 @@ import org.springframework.stereotype.Service; import java.io.IOException; import java.util.ArrayList; import java.util.List; +import tools.jackson.dataformat.yaml.YAMLFactory; /** * Loader for AI SOP definitions from YAML files. @@ -50,11 +50,11 @@ public class SopYamlLoader { public List loadAllSkills() { List skills = new ArrayList<>(); PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); - + try { Resource[] resources = resolver.getResources(SKILLS_PATH_PATTERN); log.info("Found {} SOP definition files", resources.length); - + for (Resource resource : resources) { try { SopDefinition definition = yamlMapper.readValue(resource.getInputStream(), SopDefinition.class); @@ -69,7 +69,7 @@ public class SopYamlLoader { } catch (IOException e) { log.error("Failed to scan for SOP definition files: {}", e.getMessage()); } - + return skills; } } diff --git a/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/impl/AlertDefineToolsImpl.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/impl/AlertDefineToolsImpl.java index 3df4afcb2b..f55bf17300 100644 --- a/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/impl/AlertDefineToolsImpl.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/tools/impl/AlertDefineToolsImpl.java @@ -17,9 +17,9 @@ package org.apache.hertzbeat.ai.tools.impl; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.ObjectNode; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.node.ArrayNode; +import tools.jackson.databind.node.ObjectNode; import com.usthe.sureness.subject.SubjectSum; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.ai.config.McpContextHolder; @@ -74,30 +74,30 @@ public class AlertDefineToolsImpl implements AlertDefineTools { 8. based on the user's output, conditionally call the bind_monitors_to_alert_rule tool to bind monitors to the alert rule VERY VERY IMPORTANT: - ALWAYS USE the value field from the get_apps_metrics_hierarchy's json response when creating alert expressions on the field parameters - + EXAMPLES FOR FIELD CONDITION EXPRESSION( Do not copy these examples, they are just for reference ): These are all just examples, you can take inspiration from them and create a rule based on hierarchy, always ask the user for all params, do not assume them, even for these examples: - + 1. Kafka JVM Alert: - App: "kafka", Metric: "jvm_basic" - Field condition: equals(VmName, "myVM") - Field condition expression: equals(VmName, "myVM") - + 2. LLM Credits Alert: - App: "openai", Metric: "credit_grants" - Field condition: total_granted > some_value - Field condition expression: total_granted > 1000 - + 3. HBase Master Alert: - App: "hbase_master", Metric: "server" - Field condition: heap_memory_used > 80 or some_factor<100 - Field condition expression: heap_memory_used > 80 or some_factor<100 - + 4. Complex OpenAI Credits Alert: - App: "openai", Metric: "credit_grants" - Field condition: total_used > 123 and total_granted > 333 and (total_granted > 3444 and total_paid_available < 5556) - Field condition expression: total_used > 123 and total_granted > 333 and (total_granted > 3444 and total_paid_available < 5556) - + FIELD CONDITIONS GUIDANCE: - Field names come from metric's children in hierarchy (leaf nodes) - Use the "value" field from the metric's children, not the label when creating conditions @@ -109,7 +109,7 @@ public class AlertDefineToolsImpl implements AlertDefineTools { - String values should be quoted: equals(VmName, "my-vm") - Simple conditions: heap_memory_used > 80, total_granted <= 1000 - Complex conditions: total_used > 123 and total_granted > 333 and (total_granted > 3444 and total_paid_available < 5556) - + PRIORITY LEVELS: - 0: Critical (immediate action required) - 1: Warning (attention needed, default) @@ -196,7 +196,7 @@ public class AlertDefineToolsImpl implements AlertDefineTools { return expressionValidation; // Return expression validation error message } - String expr = String.format("equals(__app__,\"%s\") && equals(__metrics__,\"%s\") && %s", + String expr = String.format("equals(__app__,\"%s\") && equals(__metrics__,\"%s\") && %s", app.trim(), metrics.trim(), fieldConditions.trim()); @@ -242,7 +242,7 @@ public class AlertDefineToolsImpl implements AlertDefineTools { .datasource(datasource) .enable(enable) .build(); - + log.debug("Current security subject for addAlertDefine: {}", subjectSum); alertDefineService.addAlertDefine(alertDefine); @@ -251,9 +251,9 @@ public class AlertDefineToolsImpl implements AlertDefineTools { String bindingNote = String.format(" (Use bind_monitors_to_alert_rule tool to associate specific monitors)"); log.info("Successfully created alert rule '{}' with ID: {}", name, alertDefine.getId()); - + StringBuilder response = new StringBuilder(); - response.append(String.format("Successfully created %s alert rule '%s' with ID: %d\n", + response.append(String.format("Successfully created %s alert rule '%s' with ID: %d\n", type, name, alertDefine.getId())); response.append(String.format("Expression: %s\n", expr)); response.append(String.format("Priority: %d (%s)\n", priority, severityLabel)); @@ -442,7 +442,7 @@ public class AlertDefineToolsImpl implements AlertDefineTools { HertzBeat: Get the hierarchical structure of all available apps and their metrics for alert rule creation. This tool provides the exact app name, metric name and corresponding param names according to each metric. Returns structured JSON data showing the complete hierarchy with field parameters for alert expressions. - + JSON Structure: - app: The application name - description: Tool description @@ -452,7 +452,7 @@ public class AlertDefineToolsImpl implements AlertDefineTools { - Non-leaf nodes have: children array VERY IMPORTANT: - ALWAYS USE the value field from the field parameters when creating alert expressions. - + This structured data is needed to create proper alert expressions. """) public String getAppsMetricsHierarchy( @@ -524,7 +524,7 @@ public class AlertDefineToolsImpl implements AlertDefineTools { // Parse monitor IDs from comma-separated string String[] monitorIdArray = monitorIds.split(","); List validMonitorIds = new ArrayList<>(); - + for (String monitorId : monitorIdArray) { String trimmedId = monitorId.trim(); if (!trimmedId.isEmpty()) { @@ -536,7 +536,7 @@ public class AlertDefineToolsImpl implements AlertDefineTools { } } } - + if (validMonitorIds.isEmpty()) { return "Error: No valid monitor IDs provided"; } @@ -560,19 +560,19 @@ public class AlertDefineToolsImpl implements AlertDefineTools { // Get the current expression and modify it String currentExpr = existingRule.getExpr(); String newExpr; - + // Check if the expression already has __instance__ conditions if (currentExpr.contains("__instance__")) { // Extract existing monitor IDs and merge with new ones List existingMonitorIds = UtilityClass.extractExistingMonitorIds(currentExpr); - + // Add new monitor IDs that aren't already present for (String newId : validMonitorIds) { if (!existingMonitorIds.contains(newId)) { existingMonitorIds.add(newId); } } - + String updatedMonitorCondition; if (existingMonitorIds.size() == 1) { updatedMonitorCondition = String.format("equals(__instance__, \"%s\")", existingMonitorIds.get(0)); @@ -587,31 +587,31 @@ public class AlertDefineToolsImpl implements AlertDefineTools { conditionBuilder.append(")"); updatedMonitorCondition = conditionBuilder.toString(); } - + // Replace existing __instance__ conditions with updated ones newExpr = UtilityClass.replaceInstanceConditions(currentExpr, updatedMonitorCondition); - + // Update the alert rule existingRule.setExpr(newExpr); log.debug("Current security subject for modifyAlertDefine: {}", subjectSum); alertDefineService.modifyAlertDefine(existingRule); - + log.info("Successfully added monitors {} to existing bindings for alert rule ID: {}", validMonitorIds, ruleId); - return String.format("Successfully added %d new monitor(s) to alert rule ID %d.\nTotal bound monitors: %s\nUpdated expression: %s", + return String.format("Successfully added %d new monitor(s) to alert rule ID %d.\nTotal bound monitors: %s\nUpdated expression: %s", validMonitorIds.size(), ruleId, String.join(", ", existingMonitorIds), newExpr); } - + // Insert the monitor condition after the metrics condition // Pattern: equals(__app__,"app") && equals(__metrics__,"metric") && [existing_conditions] // Result: equals(__app__,"app") && equals(__metrics__,"metric") && [monitor_condition] && [existing_conditions] - + if (currentExpr.matches(".*equals\\(__app__,\"[^\"]+\"\\)\\s*&&\\s*equals\\(__metrics__,\"[^\"]+\"\\)\\s*&&\\s*.*")) { // Find the position after the metrics condition String metricsPattern = "equals\\(__metrics__,\"[^\"]+\"\\)"; java.util.regex.Pattern regex = java.util.regex.Pattern.compile(metricsPattern); java.util.regex.Matcher matcher = regex.matcher(currentExpr); - + if (matcher.find()) { int metricsEnd = matcher.end(); // Find the " && " after the metrics condition @@ -636,7 +636,7 @@ public class AlertDefineToolsImpl implements AlertDefineTools { alertDefineService.modifyAlertDefine(existingRule); log.info("Successfully bound monitors {} to alert rule ID: {}", validMonitorIds, ruleId); - return String.format("Successfully bound %d monitor(s) to alert rule ID %d.\nMonitor IDs: %s\nUpdated expression: %s", + return String.format("Successfully bound %d monitor(s) to alert rule ID %d.\nMonitor IDs: %s\nUpdated expression: %s", validMonitorIds.size(), ruleId, String.join(", ", validMonitorIds), newExpr); } catch (Exception e) { diff --git a/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/utils/UtilityClass.java b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/utils/UtilityClass.java index f1c1a373e5..462e87d0f2 100644 --- a/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/utils/UtilityClass.java +++ b/hertzbeat-ai/src/main/java/org/apache/hertzbeat/ai/utils/UtilityClass.java @@ -17,9 +17,8 @@ package org.apache.hertzbeat.ai.utils; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.ObjectNode; +import tools.jackson.databind.node.ArrayNode; +import tools.jackson.databind.node.ObjectNode; import lombok.extern.slf4j.Slf4j; import java.time.Instant; @@ -31,6 +30,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import org.apache.hertzbeat.manager.pojo.dto.Hierarchy; +import tools.jackson.databind.ObjectMapper; /** * Utility class providing helper methods for field expression validation, parsing, @@ -41,13 +41,13 @@ import org.apache.hertzbeat.manager.pojo.dto.Hierarchy; @Slf4j @lombok.experimental.UtilityClass public class UtilityClass { - + /** * Validates the syntax of field conditions expression * @param fieldConditions Field conditions string to validate * @return "VALID" if syntax is correct, error message otherwise */ - + public String validateExpressionSyntax(String fieldConditions) { try { log.debug("Validating expression syntax: {}", fieldConditions); @@ -414,7 +414,7 @@ public class UtilityClass { return node; } - + /** * Format timestamp to readable format */ diff --git a/hertzbeat-alerter/pom.xml b/hertzbeat-alerter/pom.xml index ada294b45b..7af87836e9 100644 --- a/hertzbeat-alerter/pom.xml +++ b/hertzbeat-alerter/pom.xml @@ -35,6 +35,11 @@ hertzbeat-base provided + + org.apache.hertzbeat + hertzbeat-common-core + provided + org.apache.hertzbeat diff --git a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/calculate/realtime/WindowedLogRealTimeAlertCalculator.java b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/calculate/realtime/WindowedLogRealTimeAlertCalculator.java index 5b84f46b4a..5a71d5fb27 100644 --- a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/calculate/realtime/WindowedLogRealTimeAlertCalculator.java +++ b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/calculate/realtime/WindowedLogRealTimeAlertCalculator.java @@ -18,6 +18,8 @@ package org.apache.hertzbeat.alert.calculate.realtime; import com.google.common.util.concurrent.ThreadFactoryBuilder; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.alert.calculate.realtime.window.LogWorker; import org.apache.hertzbeat.alert.calculate.realtime.window.TimeService; @@ -28,8 +30,6 @@ import org.apache.hertzbeat.common.util.BackoffUtils; import org.apache.hertzbeat.common.util.ExponentialBackoff; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadPoolExecutor; @@ -83,29 +83,29 @@ public class WindowedLogRealTimeAlertCalculator implements Runnable { } } } - + private void processLogEntry(LogEntry logEntry) { // Extract event timestamp long eventTimestamp = extractEventTimestamp(logEntry); - + // Check if timestamp is within reasonable range if (!timeService.isValidTimestamp(eventTimestamp)) { log.warn("Dropping log with invalid timestamp: {}", eventTimestamp); return; } - + // Check if this is late data based on current watermark if (timeService.isLateData(eventTimestamp)) { - log.warn("Dropping late data, timestamp: {}, watermark: {}", + log.warn("Dropping late data, timestamp: {}, watermark: {}", eventTimestamp, timeService.getCurrentWatermark()); return; } - + // Update max timestamp (only validated timestamps can update watermark) timeService.updateMaxTimestamp(eventTimestamp); logWorker.reduceAndSendLogTask(logEntry); } - + private long extractEventTimestamp(LogEntry logEntry) { if (logEntry.getTimeUnixNano() != null && logEntry.getTimeUnixNano() != 0) { return logEntry.getTimeUnixNano() / 1_000_000; // Convert to milliseconds @@ -115,7 +115,7 @@ public class WindowedLogRealTimeAlertCalculator implements Runnable { } return System.currentTimeMillis(); } - + @PostConstruct public void start() { ThreadFactory threadFactory = new ThreadFactoryBuilder() @@ -147,4 +147,4 @@ public class WindowedLogRealTimeAlertCalculator implements Runnable { dispatcherExecutor.shutdownNow(); } } -} \ No newline at end of file +} diff --git a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/calculate/realtime/window/TimeService.java b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/calculate/realtime/window/TimeService.java index 6739f25186..d7d4d82bf7 100644 --- a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/calculate/realtime/window/TimeService.java +++ b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/calculate/realtime/window/TimeService.java @@ -19,14 +19,14 @@ package org.apache.hertzbeat.alert.calculate.realtime.window; import com.google.common.util.concurrent.ThreadFactoryBuilder; +import jakarta.annotation.PostConstruct; import lombok.AllArgsConstructor; import lombok.Data; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; +import jakarta.annotation.PreDestroy; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.Executors; @@ -44,23 +44,23 @@ import java.util.concurrent.atomic.AtomicLong; @Component @Slf4j public class TimeService { - + static final long DEFAULT_WATERMARK_DELAY_MS = 30_000; // 30 seconds private static final long WATERMARK_BROADCAST_INTERVAL_MS = 5_000; // 5 seconds - + // Define acceptable timestamp range to filter abnormal timestamps private static final long MAX_FUTURE_TIME_MS = 60_000; // Allow 1 minute future time private static final long MAX_PAST_TIME_MS = 24 * 60 * 60 * 1000; // Allow 24 hours past time - + private final AtomicLong maxTimestamp = new AtomicLong(0); private final AtomicLong currentWatermark = new AtomicLong(0); private final CopyOnWriteArrayList listeners = new CopyOnWriteArrayList<>(); private ScheduledExecutorService scheduler; - + public TimeService(List initialListeners) { listeners.addAll(initialListeners); } - + @PostConstruct public void start() { // Create internal scheduled executor @@ -72,9 +72,9 @@ public class TimeService { .setDaemon(true) .setNameFormat("timeservice-scheduler-%d") .build(); - + this.scheduler = Executors.newSingleThreadScheduledExecutor(threadFactory); - + // Start watermark broadcast scheduler scheduler.scheduleAtFixedRate( this::broadcastWatermark, @@ -82,10 +82,10 @@ public class TimeService { WATERMARK_BROADCAST_INTERVAL_MS, TimeUnit.MILLISECONDS ); - + log.info("TimeService started with watermark delay: {}ms", DEFAULT_WATERMARK_DELAY_MS); } - + @PreDestroy public void stop() { if (scheduler != null && !scheduler.isShutdown()) { @@ -105,10 +105,10 @@ public class TimeService { Thread.currentThread().interrupt(); } } - + log.info("TimeService stopped"); } - + /** * Check if timestamp is within acceptable range */ @@ -116,35 +116,35 @@ public class TimeService { long currentTime = System.currentTimeMillis(); return timestamp >= (currentTime - MAX_PAST_TIME_MS) && timestamp <= (currentTime + MAX_FUTURE_TIME_MS); } - + /** * Check if data is late based on current watermark */ public boolean isLateData(long timestamp) { return timestamp < getCurrentWatermark(); } - + /** * Update max timestamp from WindowedLogRealTimeAlertCalculator */ public void updateMaxTimestamp(long timestamp) { maxTimestamp.getAndUpdate(current -> Math.max(current, timestamp)); } - + /** * Add watermark listener */ public void addWatermarkListener(WatermarkListener listener) { listeners.add(listener); } - + /** * Remove watermark listener */ public void removeWatermarkListener(WatermarkListener listener) { listeners.remove(listener); } - + /** * Get current watermark */ @@ -158,12 +158,12 @@ public class TimeService { public long getMaxTimestamp() { return maxTimestamp.get(); } - + /** * Calculate and broadcast watermark */ private void broadcastWatermark() { - + try { long maxTs = maxTimestamp.get(); if (maxTs <= 0) { @@ -172,7 +172,7 @@ public class TimeService { // Calculate watermark: maxTimestamp - delay long newWatermark = maxTs - DEFAULT_WATERMARK_DELAY_MS; long currentWm = currentWatermark.get(); - + // Only advance watermark (monotonic property) if (newWatermark <= currentWm) { return; @@ -193,7 +193,7 @@ public class TimeService { log.error("Error in watermark broadcast: {}", e.getMessage(), e); } } - + /** * Watermark data class */ @@ -203,11 +203,11 @@ public class TimeService { public static class Watermark { private final long timestamp; } - + /** * Interface for watermark listeners */ public interface WatermarkListener { void onWatermark(Watermark watermark); } -} \ No newline at end of file +} diff --git a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/calculate/realtime/window/WindowAggregator.java b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/calculate/realtime/window/WindowAggregator.java index 935461e50b..5fd4ca6fd1 100644 --- a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/calculate/realtime/window/WindowAggregator.java +++ b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/calculate/realtime/window/WindowAggregator.java @@ -18,6 +18,7 @@ package org.apache.hertzbeat.alert.calculate.realtime.window; import com.google.common.util.concurrent.ThreadFactoryBuilder; +import jakarta.annotation.PostConstruct; import lombok.AllArgsConstructor; import lombok.Data; import lombok.Getter; @@ -25,8 +26,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.entity.alerter.AlertDefine; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; +import jakarta.annotation.PreDestroy; import java.util.ArrayList; import java.util.Iterator; @@ -51,14 +51,14 @@ import java.util.concurrent.TimeUnit; @Component @Slf4j public class WindowAggregator implements TimeService.WatermarkListener, Runnable { - + private static final long DEFAULT_WINDOW_SIZE_MS = 1 * 60 * 1000; // 1 minutes - + private final AlarmEvaluator alarmEvaluator; private final BlockingQueue eventQueue = new LinkedBlockingQueue<>(); private final Map activeWindows = new HashMap<>(); private final Object windowLock = new Object(); - + private ExecutorService aggregatorExecutor; public WindowAggregator(AlarmEvaluator alarmEvaluator) { @@ -73,31 +73,31 @@ public class WindowAggregator implements TimeService.WatermarkListener, Runnable log.warn("Interrupted while adding matching log to aggregator"); } } - + @Override public void onWatermark(TimeService.Watermark watermark) { List closedWindows; - + synchronized (windowLock) { closedWindows = new ArrayList<>(); - + // Find windows that should be closed based on watermark Iterator> iterator = activeWindows.entrySet().iterator(); while (iterator.hasNext()) { Map.Entry entry = iterator.next(); WindowData windowData = entry.getValue(); - + // Close window if its end time <= watermark timestamp if (windowData.getEndTime() <= watermark.getTimestamp()) { closedWindows.add(windowData); iterator.remove(); - - log.debug("Closing window: {} with {} matching logs", + + log.debug("Closing window: {} with {} matching logs", entry.getKey(), windowData.getMatchingLogs().size()); } } - } - + } + for (WindowData windowData : closedWindows) { alarmEvaluator.sendAndProcessWindowData(windowData); } @@ -117,17 +117,17 @@ public class WindowAggregator implements TimeService.WatermarkListener, Runnable } } } - + private void processMatchingLogEvent(MatchingLogEvent event) { - + // Determine window size from alert define (if specified) or use default long windowSizeMs = getWindowSize(event.getAlertDefine()); - + // Calculate window boundaries long eventTime = event.getEventTimestamp(); long windowStart = (eventTime / windowSizeMs) * windowSizeMs; long windowEnd = windowStart + windowSizeMs; - + // Create window key WindowKey windowKey = new WindowKey( event.getAlertDefine().getId(), @@ -136,15 +136,15 @@ public class WindowAggregator implements TimeService.WatermarkListener, Runnable ); synchronized (windowLock) { // Get or create window data - WindowData windowData = activeWindows.computeIfAbsent(windowKey, + WindowData windowData = activeWindows.computeIfAbsent(windowKey, key -> new WindowData(key, event.getAlertDefine())); // Add matching log to window windowData.addMatchingLog(event); - log.debug("Added matching log to window: {} (total logs: {})", + log.debug("Added matching log to window: {} (total logs: {})", windowKey, windowData.getMatchingLogs().size()); } } - + private long getWindowSize(AlertDefine alertDefine) { // Check if alert define has custom window size configuration if (alertDefine.getPeriod() != null) { @@ -154,7 +154,7 @@ public class WindowAggregator implements TimeService.WatermarkListener, Runnable DEFAULT_WINDOW_SIZE_MS, alertDefine.getName()); return DEFAULT_WINDOW_SIZE_MS; } - + @PostConstruct public void start() { // Create internal executor @@ -166,15 +166,15 @@ public class WindowAggregator implements TimeService.WatermarkListener, Runnable .setDaemon(true) .setNameFormat("window-aggregator-%d") .build(); - + aggregatorExecutor = Executors.newSingleThreadExecutor(threadFactory); // Submit aggregation task aggregatorExecutor.submit(this); - + log.info("WindowAggregator started"); } - + @PreDestroy public void stop() { if (aggregatorExecutor != null && !aggregatorExecutor.isShutdown()) { @@ -194,10 +194,10 @@ public class WindowAggregator implements TimeService.WatermarkListener, Runnable Thread.currentThread().interrupt(); } } - + log.info("WindowAggregator stopped"); } - + /** * Window key for identifying unique windows */ @@ -209,7 +209,7 @@ public class WindowAggregator implements TimeService.WatermarkListener, Runnable private final long startTime; private final long endTime; } - + /** * Window data container */ @@ -221,13 +221,13 @@ public class WindowAggregator implements TimeService.WatermarkListener, Runnable private final List matchingLogs = new ArrayList<>(); @Getter private final long createdTime; - + public WindowData(WindowKey windowKey, AlertDefine alertDefine) { this.windowKey = windowKey; this.alertDefine = alertDefine; this.createdTime = System.currentTimeMillis(); } - + public void addMatchingLog(MatchingLogEvent event) { matchingLogs.add(event); } @@ -248,4 +248,4 @@ public class WindowAggregator implements TimeService.WatermarkListener, Runnable */ public long getEndTime() { return windowKey.getEndTime(); } } -} \ No newline at end of file +} diff --git a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/notice/impl/EmailAlertNotifyHandlerImpl.java b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/notice/impl/EmailAlertNotifyHandlerImpl.java index 5bb8d6f680..f2d8f7eb02 100644 --- a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/notice/impl/EmailAlertNotifyHandlerImpl.java +++ b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/notice/impl/EmailAlertNotifyHandlerImpl.java @@ -17,12 +17,10 @@ package org.apache.hertzbeat.alert.notice.impl; -import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.mail.internet.MimeMessage; import java.util.Date; import java.util.Properties; import java.util.ResourceBundle; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.entity.dto.MailServerConfig; import org.apache.hertzbeat.alert.notice.AlertNoticeException; @@ -31,6 +29,7 @@ import org.apache.hertzbeat.common.entity.manager.GeneralConfig; import org.apache.hertzbeat.common.entity.alerter.NoticeReceiver; import org.apache.hertzbeat.common.entity.alerter.NoticeTemplate; import org.apache.hertzbeat.common.support.event.SystemConfigChangeEvent; +import org.apache.hertzbeat.common.util.JsonUtil; import org.apache.hertzbeat.common.util.ResourceBundleUtil; import org.apache.hertzbeat.base.dao.GeneralConfigDao; import org.springframework.beans.factory.annotation.Value; @@ -44,7 +43,6 @@ import org.springframework.stereotype.Component; * Send alarm information through email */ @Component -@RequiredArgsConstructor @Slf4j public class EmailAlertNotifyHandlerImpl extends AbstractAlertNotifyHandlerImpl { @@ -70,12 +68,15 @@ public class EmailAlertNotifyHandlerImpl extends AbstractAlertNotifyHandlerImpl private final GeneralConfigDao generalConfigDao; - private final ObjectMapper objectMapper; - private static final String TYPE = "email"; private ResourceBundle bundle = ResourceBundleUtil.getBundle("alerter"); + public EmailAlertNotifyHandlerImpl(JavaMailSender javaMailSender, GeneralConfigDao generalConfigDao) { + this.javaMailSender = javaMailSender; + this.generalConfigDao = generalConfigDao; + } + @Override public void send(NoticeReceiver receiver, NoticeTemplate noticeTemplate, GroupAlert alert) throws AlertNoticeException { try { @@ -88,8 +89,8 @@ public class EmailAlertNotifyHandlerImpl extends AbstractAlertNotifyHandlerImpl if (emailConfig != null && emailConfig.getContent() != null) { // enable database configuration String content = emailConfig.getContent(); - MailServerConfig emailNoticeSenderConfig = objectMapper.readValue(content, MailServerConfig.class); - if (emailNoticeSenderConfig.isEnable()) { + MailServerConfig emailNoticeSenderConfig = JsonUtil.fromJson(content, MailServerConfig.class); + if (emailNoticeSenderConfig != null && emailNoticeSenderConfig.isEnable()) { sender.setHost(emailNoticeSenderConfig.getEmailHost()); sender.setPort(emailNoticeSenderConfig.getEmailPort()); sender.setUsername(emailNoticeSenderConfig.getEmailUsername()); diff --git a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/notice/impl/FeiShuAppAlertNotifyHandlerImpl.java b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/notice/impl/FeiShuAppAlertNotifyHandlerImpl.java index 1c49c08af8..51f961bff9 100644 --- a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/notice/impl/FeiShuAppAlertNotifyHandlerImpl.java +++ b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/notice/impl/FeiShuAppAlertNotifyHandlerImpl.java @@ -18,9 +18,6 @@ package org.apache.hertzbeat.alert.notice.impl; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -49,6 +46,7 @@ import java.util.List; import java.util.Objects; import java.util.UUID; import java.util.stream.Collectors; +import tools.jackson.databind.JsonNode; /** * FeiShu app alert notify impl @@ -78,7 +76,6 @@ public class FeiShuAppAlertNotifyHandlerImpl extends AbstractAlertNotifyHandlerI */ private static final String APP_BATCH_MESSAGE_URL = "https://open.feishu.cn/open-apis/message/v4/batch_send/"; - private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); private static final byte USER_RECEIVE_TYPE = 0; private static final byte CHAT_RECEIVE_TYPE = 1; private static final byte PART_RECEIVE_TYPE = 2; @@ -134,7 +131,7 @@ public class FeiShuAppAlertNotifyHandlerImpl extends AbstractAlertNotifyHandlerI * @param messageContent Message content * @see send message */ - private void sendLarkMessage(String accessToken, String receiverIdType, String receiverId, JsonNode messageContent) throws JsonProcessingException { + private void sendLarkMessage(String accessToken, String receiverIdType, String receiverId, JsonNode messageContent) { HttpHeaders headers = new HttpHeaders(); headers.setContentType(MediaType.APPLICATION_JSON); headers.setBearerAuth(accessToken); @@ -246,7 +243,7 @@ public class FeiShuAppAlertNotifyHandlerImpl extends AbstractAlertNotifyHandlerI return response.getBody(); } - private JsonNode createLarkMessage(NoticeReceiver receiver, String notificationContent) throws JsonProcessingException { + private JsonNode createLarkMessage(NoticeReceiver receiver, String notificationContent) { String larkCardMessage = """ { "schema": "2.0", @@ -359,12 +356,12 @@ public class FeiShuAppAlertNotifyHandlerImpl extends AbstractAlertNotifyHandlerI String jsonStr = String.format(larkCardMessage, notificationContent.replace("\"", "\\\"") + atUserElement, alerterProperties.getConsoleUrl()); - return OBJECT_MAPPER.readTree(jsonStr); + return JsonUtil.fromJson(jsonStr); } - private String escapedCompactJson(JsonNode json) throws JsonProcessingException { - return OBJECT_MAPPER.writeValueAsString(json); + private String escapedCompactJson(JsonNode json) { + return json.toString(); } /** diff --git a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/SmsClientFactory.java b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/SmsClientFactory.java index 16d5df72ae..0047d0f8fa 100644 --- a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/SmsClientFactory.java +++ b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/SmsClientFactory.java @@ -17,7 +17,6 @@ package org.apache.hertzbeat.alert.service; -import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.entity.dto.sms.SmsConfig; import org.apache.hertzbeat.alert.service.impl.SmsLocalSmsClientImpl; @@ -30,6 +29,7 @@ import org.apache.hertzbeat.base.dao.GeneralConfigDao; import org.apache.hertzbeat.common.constants.GeneralConfigTypeEnum; import org.apache.hertzbeat.common.entity.manager.GeneralConfig; import org.apache.hertzbeat.common.support.event.SmsConfigChangeEvent; +import org.apache.hertzbeat.common.util.JsonUtil; import org.springframework.context.event.EventListener; import org.springframework.stereotype.Component; @@ -50,14 +50,12 @@ public class SmsClientFactory { private static final String TYPE = GeneralConfigTypeEnum.sms.name(); private final GeneralConfigDao generalConfigDao; - private final ObjectMapper objectMapper; private final SmsConfig yamlSmsConfig; private volatile SmsClient currentSmsClient; - public SmsClientFactory(GeneralConfigDao generalConfigDao, ObjectMapper objectMapper, SmsConfig yamlSmsConfig) { + public SmsClientFactory(GeneralConfigDao generalConfigDao, SmsConfig yamlSmsConfig) { this.generalConfigDao = generalConfigDao; - this.objectMapper = objectMapper; this.yamlSmsConfig = yamlSmsConfig; } @@ -118,7 +116,7 @@ public class SmsClientFactory { try { GeneralConfig config = generalConfigDao.findByType(TYPE); if (config != null && config.getContent() != null) { - return objectMapper.readValue(config.getContent(), SmsConfig.class); + return JsonUtil.fromJson(config.getContent(), SmsConfig.class); } } catch (Exception e) { log.error("[SmsClientFactory] Failed to load database configuration", e); diff --git a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineExcelImExportServiceImpl.java b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineExcelImExportServiceImpl.java index 1accfbb46f..91feab35d4 100644 --- a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineExcelImExportServiceImpl.java +++ b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineExcelImExportServiceImpl.java @@ -19,7 +19,6 @@ package org.apache.hertzbeat.alert.service.impl; import static org.apache.hertzbeat.common.constants.ExportFileConstants.ExcelFile.FILE_SUFFIX; import static org.apache.hertzbeat.common.constants.ExportFileConstants.ExcelFile.TYPE; -import com.fasterxml.jackson.core.type.TypeReference; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -42,6 +41,7 @@ import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.WorkbookFactory; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; +import tools.jackson.core.type.TypeReference; /** * Configure the import and export EXCEL format diff --git a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineJsonImExportServiceImpl.java b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineJsonImExportServiceImpl.java index cb705841dd..1379c5e3fb 100644 --- a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineJsonImExportServiceImpl.java +++ b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineJsonImExportServiceImpl.java @@ -19,27 +19,22 @@ package org.apache.hertzbeat.alert.service.impl; import static org.apache.hertzbeat.common.constants.ExportFileConstants.JsonFile.FILE_SUFFIX; import static org.apache.hertzbeat.common.constants.ExportFileConstants.JsonFile.TYPE; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; -import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.List; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.alert.dto.ExportAlertDefineDTO; +import org.apache.hertzbeat.common.util.JsonUtil; import org.springframework.stereotype.Service; +import tools.jackson.core.type.TypeReference; /** * Configure the import and export JSON format */ @Slf4j -@RequiredArgsConstructor @Service public class AlertDefineJsonImExportServiceImpl extends AlertDefineAbstractImExportServiceImpl { - private final ObjectMapper objectMapper; - @Override public String type() { return TYPE; @@ -52,22 +47,12 @@ public class AlertDefineJsonImExportServiceImpl extends AlertDefineAbstractImExp @Override public List parseImport(InputStream is) { - try { - return objectMapper.readValue(is, new TypeReference<>() { - }); - } catch (IOException ex) { - log.error("import alertDefine failed.", ex); - throw new RuntimeException("import alertDefine failed"); - } + return JsonUtil.fromJson(is, new TypeReference<>() { + }); } @Override public void writeOs(List exportAlertDefineList, OutputStream os) { - try { - objectMapper.writeValue(os, exportAlertDefineList); - } catch (IOException ex) { - log.error("export alertDefine failed.", ex); - throw new RuntimeException("export alertDefine failed"); - } + JsonUtil.toJson(exportAlertDefineList, os); } } diff --git a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineServiceImpl.java b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineServiceImpl.java index e720cfb427..f08234ab30 100644 --- a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineServiceImpl.java +++ b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlertDefineServiceImpl.java @@ -17,9 +17,8 @@ package org.apache.hertzbeat.alert.service.impl; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.annotation.Resource; +import tools.jackson.core.type.TypeReference; import jakarta.persistence.criteria.CriteriaBuilder; import jakarta.persistence.criteria.Predicate; import jakarta.servlet.http.HttpServletResponse; @@ -39,6 +38,7 @@ import org.apache.hertzbeat.common.entity.alerter.AlertDefine; import org.apache.hertzbeat.common.entity.manager.Label; import org.apache.hertzbeat.common.util.FileUtil; import org.apache.hertzbeat.common.util.JexlExpressionRunner; +import org.apache.hertzbeat.common.util.JsonUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; @@ -51,7 +51,6 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; import java.net.URLDecoder; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; @@ -98,7 +97,7 @@ public class AlertDefineServiceImpl implements AlertDefineService { CommonConstants.LABEL_ALERT_SEVERITY, CommonConstants.ALERT_MODE_LABEL ); - + public AlertDefineServiceImpl(List alertDefineImExportServiceList, DataSourceService dataSourceService) { alertDefineImExportServiceList.forEach(it -> alertDefineImExportServiceMap.put(it.type(), it)); this.dataSourceService = dataSourceService; @@ -185,14 +184,9 @@ public class AlertDefineServiceImpl implements AlertDefineService { @Override public Page getAlertDefines(List defineIds, String search, String sort, String order, int pageIndex, int pageSize) { // parse translation content list - ObjectMapper objectMapper = new ObjectMapper(); List searchList = Collections.emptyList(); if (StringUtils.hasText(search)) { - try { - searchList = objectMapper.readValue(URLDecoder.decode(search, StandardCharsets.UTF_8), new TypeReference<>() {}); - } catch (JsonProcessingException e) { - throw new IllegalArgumentException("Failed to parse search parameter", e); - } + searchList = JsonUtil.fromJson(URLDecoder.decode(search, StandardCharsets.UTF_8), new TypeReference<>() {}); } List finalSearchList = searchList; // build search condition diff --git a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlibabaCloudSlsExternAlertService.java b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlibabaCloudSlsExternAlertService.java index 89260fd254..a3019b350e 100644 --- a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlibabaCloudSlsExternAlertService.java +++ b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlibabaCloudSlsExternAlertService.java @@ -17,7 +17,7 @@ package org.apache.hertzbeat.alert.service.impl; -import com.fasterxml.jackson.core.type.TypeReference; +import tools.jackson.core.type.TypeReference; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; @@ -199,4 +199,4 @@ public class AlibabaCloudSlsExternAlertService implements ExternAlertService { } } -} \ No newline at end of file +} diff --git a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlibabaSmsClientImpl.java b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlibabaSmsClientImpl.java index bf9bdece4b..34b6ebe1d0 100644 --- a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlibabaSmsClientImpl.java +++ b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AlibabaSmsClientImpl.java @@ -17,7 +17,6 @@ package org.apache.hertzbeat.alert.service.impl; -import com.fasterxml.jackson.databind.JsonNode; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.entity.dto.sms.AlibabaSmsProperties; import org.apache.hertzbeat.alert.service.SmsClient; @@ -45,6 +44,7 @@ import java.util.Map; import java.util.SimpleTimeZone; import java.util.TreeMap; import java.util.UUID; +import tools.jackson.databind.JsonNode; import static org.apache.hertzbeat.common.constants.SmsConstants.ALIBABA; @@ -60,7 +60,7 @@ public class AlibabaSmsClientImpl implements SmsClient { private static final String ACTION = "SendSms"; private static final String HOST = "dysmsapi.aliyuncs.com"; private static final String ALGORITHM = "ACS3-HMAC-SHA256"; - + private final String accessKeyId; private final String accessKeySecret; private final String signName; @@ -151,7 +151,7 @@ public class AlibabaSmsClientImpl implements SmsClient { httpPost.setHeader("x-acs-version", API_VERSION); httpPost.setHeader("x-acs-date", timestamp); httpPost.setHeader("x-acs-signature-nonce", nonce); - httpPost.setHeader("x-acs-content-sha256", + httpPost.setHeader("x-acs-content-sha256", CryptoUtils.sha256Hex("")); log.info("Sending Alibaba SMS request to {}", url + ", params: " + templateParam + "headers: " + Arrays.toString(httpPost.getAllHeaders())); @@ -236,4 +236,4 @@ public class AlibabaSmsClientImpl implements SmsClient { public boolean checkConfig() { return !(accessKeyId.isBlank() || accessKeySecret.isBlank() || signName.isBlank() || templateCode.isBlank()); } -} +} diff --git a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AwsSmsClientImpl.java b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AwsSmsClientImpl.java index 8fb8c52bbd..6e9dd601c6 100644 --- a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AwsSmsClientImpl.java +++ b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/AwsSmsClientImpl.java @@ -17,8 +17,7 @@ package org.apache.hertzbeat.alert.service.impl; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.JsonNode; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.entity.dto.sms.AwsSmsProperties; import org.apache.hertzbeat.alert.service.SmsClient; @@ -110,7 +109,10 @@ public class AwsSmsClientImpl implements SmsClient { String endpoint = "https://" + SERVICE + "." + region + ".amazonaws.com"; try (CloseableHttpClient httpClient = HttpClients.createDefault()) { - String payloadInString = new ObjectMapper().writeValueAsString(payload); + String payloadInString = JsonUtil.toJson(payload); + if (payloadInString == null) { + throw new SendMessageException("Failed to serialize SMS payload"); + } URI requestUri = new URI(endpoint); HttpPost httpPost = createHttpPost(requestUri, amzDate, payloadInString); diff --git a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/HuaweiCloudExternAlertService.java b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/HuaweiCloudExternAlertService.java index 335426f5db..075e9939bc 100644 --- a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/HuaweiCloudExternAlertService.java +++ b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/HuaweiCloudExternAlertService.java @@ -17,7 +17,7 @@ package org.apache.hertzbeat.alert.service.impl; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -401,4 +401,4 @@ public class HuaweiCloudExternAlertService implements ExternAlertService { this.endpoint = endpoint; } } -} \ No newline at end of file +} diff --git a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/PrometheusExternAlertService.java b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/PrometheusExternAlertService.java index c7eb272258..0fbb6fb5fb 100644 --- a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/PrometheusExternAlertService.java +++ b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/PrometheusExternAlertService.java @@ -17,7 +17,7 @@ package org.apache.hertzbeat.alert.service.impl; -import com.fasterxml.jackson.core.type.TypeReference; +import tools.jackson.core.type.TypeReference; import java.time.Instant; import java.util.HashMap; import java.util.List; @@ -88,7 +88,7 @@ public class PrometheusExternAlertService implements ExternAlertService { .triggerTimes(1) .build(); - alarmCommonReduce.reduceAndSendAlarm(singleAlert); + alarmCommonReduce.reduceAndSendAlarm(singleAlert); } } diff --git a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/SkyWalkingExternAlertService.java b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/SkyWalkingExternAlertService.java index 9f1b33dd81..889e879429 100644 --- a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/SkyWalkingExternAlertService.java +++ b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/SkyWalkingExternAlertService.java @@ -17,7 +17,6 @@ package org.apache.hertzbeat.alert.service.impl; -import com.fasterxml.jackson.core.type.TypeReference; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.alert.dto.SkyWalkingExternAlert; import org.apache.hertzbeat.alert.reduce.AlarmCommonReduce; @@ -32,6 +31,7 @@ import java.time.Instant; import java.util.HashMap; import java.util.List; import java.util.Map; +import tools.jackson.core.type.TypeReference; /** * SkyWalking external alarm service impl @@ -62,7 +62,7 @@ public class SkyWalkingExternAlertService implements ExternAlertService { .annotations(acquireAlertAnnotations(alert)) .triggerTimes(1) .build(); - alarmCommonReduce.reduceAndSendAlarm(singleAlert); + alarmCommonReduce.reduceAndSendAlarm(singleAlert); } } diff --git a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/SmsLocalSmsClientImpl.java b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/SmsLocalSmsClientImpl.java index 47eaafffea..bcb16f6abb 100644 --- a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/SmsLocalSmsClientImpl.java +++ b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/SmsLocalSmsClientImpl.java @@ -17,7 +17,7 @@ package org.apache.hertzbeat.alert.service.impl; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; diff --git a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/TencentSmsClientImpl.java b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/TencentSmsClientImpl.java index b5cb3e5524..90ceefe5f8 100644 --- a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/TencentSmsClientImpl.java +++ b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/TencentSmsClientImpl.java @@ -33,7 +33,7 @@ import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.util.EntityUtils; import org.apache.hertzbeat.common.util.JsonUtil; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; @@ -59,7 +59,7 @@ public class TencentSmsClientImpl implements SmsClient { private static final String ACTION = "SendSms"; private static final String HOST = "sms.tencentcloudapi.com"; private static final Charset UTF8 = StandardCharsets.UTF_8; - + private String appId; private String signName; private String templateId; @@ -107,7 +107,7 @@ public class TencentSmsClientImpl implements SmsClient { String[] templateValues, String[] phones) { try (CloseableHttpClient httpClient = HttpClients.createDefault()) { String timestamp = String.valueOf(System.currentTimeMillis() / 1000); - + // build request payload Map params = new HashMap<>(); params.put("SmsSdkAppId", appId); @@ -115,14 +115,14 @@ public class TencentSmsClientImpl implements SmsClient { params.put("TemplateId", templateId); params.put("TemplateParamSet", templateValues); params.put("PhoneNumberSet", phones); - + String payload = JsonUtil.toJson(params); - + // calculate request signature String authorization = calculateAuthorization( secretId, secretKey, "sms", HOST, REGION, ACTION, API_VERSION, payload); - + // build http request HttpPost httpPost = new HttpPost("https://" + HOST); httpPost.setHeader("Content-Type", "application/json; charset=utf-8"); @@ -142,11 +142,11 @@ public class TencentSmsClientImpl implements SmsClient { String responseBody = EntityUtils.toString(response.getEntity()); log.debug("SMS response status: {}, body: {}", statusCode, responseBody); - + if (statusCode != 200) { throw new SendMessageException("HTTP request failed with status code: " + statusCode); } - + JsonNode jsonResponse = JsonUtil.fromJson(responseBody); JsonNode responseNode = jsonResponse.get("Response"); JsonNode error = responseNode.get("Error"); diff --git a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/TwilioSmsClientImpl.java b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/TwilioSmsClientImpl.java index 67059d776d..55e1fd355f 100644 --- a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/TwilioSmsClientImpl.java +++ b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/TwilioSmsClientImpl.java @@ -17,7 +17,7 @@ package org.apache.hertzbeat.alert.service.impl; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.entity.dto.sms.TwilioSmsProperties; import org.apache.hertzbeat.alert.service.SmsClient; diff --git a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/UniSmsClientImpl.java b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/UniSmsClientImpl.java index 54f43781d2..d4a414e12c 100644 --- a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/UniSmsClientImpl.java +++ b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/UniSmsClientImpl.java @@ -31,7 +31,6 @@ import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.util.EntityUtils; -import com.fasterxml.jackson.databind.JsonNode; import org.apache.hertzbeat.alert.util.CryptoUtils; import java.io.IOException; @@ -41,6 +40,7 @@ import java.util.Map; import java.util.TreeMap; import java.util.UUID; import java.util.stream.Collectors; +import tools.jackson.databind.JsonNode; import static org.apache.hertzbeat.common.constants.SmsConstants.UNISMS; @@ -55,7 +55,7 @@ public class UniSmsClientImpl implements SmsClient { private static final String ACTION = "sms.message.send"; private static final String SUCCESS_CODE = "0"; private static final String HMAC_ALGORITHM = "hmac-sha256"; - + private final UniSmsProperties config; public UniSmsClientImpl(UniSmsProperties config) { @@ -80,7 +80,7 @@ public class UniSmsClientImpl implements SmsClient { if (content == null) { content = alert.getCommonAnnotations().values().stream().findFirst().orElse(null); } - + templateData.put("instance", instance); templateData.put("priority", priority); templateData.put("content", content); @@ -98,7 +98,7 @@ public class UniSmsClientImpl implements SmsClient { HttpPost httpPost = new HttpPost(url); httpPost.setHeader("Content-Type", "application/json"); httpPost.setHeader("Accept", "application/json"); - + String payload = JsonUtil.toJson(params); httpPost.setEntity(new StringEntity(payload, StandardCharsets.UTF_8)); @@ -114,14 +114,14 @@ public class UniSmsClientImpl implements SmsClient { } private String buildSimpleUrl() { - return String.format("%s/?action=%s&accessKeyId=%s", + return String.format("%s/?action=%s&accessKeyId=%s", API_URL, ACTION, config.getAccessKeyId()); } private String buildHmacUrl() { long timestamp = System.currentTimeMillis(); String nonce = generateNonce(); - + // build query parameters Map params = new TreeMap<>(); params.put("accessKeyId", config.getAccessKeyId()); @@ -134,7 +134,7 @@ public class UniSmsClientImpl implements SmsClient { String signText = params.entrySet().stream() .map(entry -> entry.getKey() + "=" + entry.getValue()) .collect(Collectors.joining("&")); - + // calculate signature String signature = CryptoUtils.hmacSha256Base64(config.getAccessKeySecret(), signText); return String.format("%s/?action=%s&accessKeyId=%s&algorithm=%s×tamp=%d&nonce=%s&signature=%s", @@ -148,20 +148,20 @@ public class UniSmsClientImpl implements SmsClient { private void handleResponse(CloseableHttpResponse response, String phone) throws IOException { int statusCode = response.getStatusLine().getStatusCode(); String responseBody = EntityUtils.toString(response.getEntity()); - + log.info("UniSMS response status: {}, body: {}", statusCode, responseBody); - + if (statusCode != 200) { throw new SendMessageException("HTTP request failed with status code: " + statusCode + ", response: " + responseBody); } - + JsonNode jsonResponse = JsonUtil.fromJson(responseBody); String code = jsonResponse.get("code").asText(); if (!SUCCESS_CODE.equals(code)) { String message = jsonResponse.get("message").asText(); throw new SendMessageException(code + ":" + message); } - + log.info("Successfully sent SMS to phone: {}", phone); } @@ -172,22 +172,22 @@ public class UniSmsClientImpl implements SmsClient { @Override public boolean checkConfig() { - if (config == null - || config.getAccessKeyId() == null + if (config == null + || config.getAccessKeyId() == null || config.getAccessKeyId().isBlank() - || config.getSignature() == null + || config.getSignature() == null || config.getSignature().isBlank() - || config.getTemplateId() == null + || config.getTemplateId() == null || config.getTemplateId().isBlank()) { return false; } // HMAC mode requires additional check for accessKeySecret - if ("hmac".equalsIgnoreCase(config.getAuthMode()) + if ("hmac".equalsIgnoreCase(config.getAuthMode()) && (config.getAccessKeySecret() == null || config.getAccessKeySecret().isBlank())) { return false; } return true; } -} +} diff --git a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/VolcEngineExternAlertService.java b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/VolcEngineExternAlertService.java index 3676cf35cc..65a282e6ae 100644 --- a/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/VolcEngineExternAlertService.java +++ b/hertzbeat-alerter/src/main/java/org/apache/hertzbeat/alert/service/impl/VolcEngineExternAlertService.java @@ -17,10 +17,8 @@ package org.apache.hertzbeat.alert.service.impl; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.JsonNode; import lombok.RequiredArgsConstructor; -import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.hertzbeat.alert.dto.VolcEngineExternEventAlert; @@ -56,10 +54,12 @@ public class VolcEngineExternAlertService implements ExternAlertService { ); @Override - @SneakyThrows public void addExternAlert(String content) { - ObjectMapper mapper = new ObjectMapper(); - JsonNode root = mapper.readTree(content); + JsonNode root = JsonUtil.fromJson(content); + if (root == null) { + log.warn("parse extern alert content failed! content: {}", content); + return; + } String type = root.get("Type").asText(); if (VolcEngineExternMetricAlert.ALERT_TYPE_EVENT.equals(type)) { VolcEngineExternEventAlert eventAlert = JsonUtil.fromJson(content, VolcEngineExternEventAlert.class); diff --git a/hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/notice/impl/EmailAlertNotifyHandlerImplTest.java b/hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/notice/impl/EmailAlertNotifyHandlerImplTest.java index 237e5a2ced..901b27fae5 100644 --- a/hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/notice/impl/EmailAlertNotifyHandlerImplTest.java +++ b/hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/notice/impl/EmailAlertNotifyHandlerImplTest.java @@ -19,13 +19,10 @@ package org.apache.hertzbeat.alert.notice.impl; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import java.util.Properties; import org.apache.hertzbeat.common.entity.dto.MailServerConfig; import org.apache.hertzbeat.base.dao.GeneralConfigDao; @@ -35,6 +32,7 @@ import org.apache.hertzbeat.common.entity.alerter.NoticeTemplate; import org.apache.hertzbeat.common.entity.alerter.SingleAlert; import org.apache.hertzbeat.alert.notice.AlertNoticeException; import org.apache.hertzbeat.common.entity.manager.GeneralConfig; +import org.apache.hertzbeat.common.util.JsonUtil; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -57,18 +55,15 @@ class EmailAlertNotifyHandlerImplTest { @Mock private JavaMailSenderImpl mailSender; - - @Mock - private ResourceBundle bundle; - - @Mock - private GeneralConfigDao generalConfigDao; - - @Mock - private MimeMessage mimeMessage; @Mock - private ObjectMapper objectMapper; + private ResourceBundle bundle; + + @Mock + private GeneralConfigDao generalConfigDao; + + @Mock + private MimeMessage mimeMessage; @InjectMocks private EmailAlertNotifyHandlerImpl emailAlertNotifyHandler; @@ -78,27 +73,27 @@ class EmailAlertNotifyHandlerImplTest { private NoticeTemplate template; @BeforeEach - public void setUp() throws JsonProcessingException { + public void setUp() { receiver = new NoticeReceiver(); receiver.setId(1L); receiver.setName("test-receiver"); receiver.setEmail("test@example.com"); - + groupAlert = new GroupAlert(); SingleAlert singleAlert = new SingleAlert(); singleAlert.setLabels(new HashMap<>()); singleAlert.getLabels().put("severity", "critical"); singleAlert.getLabels().put("alertname", "Test Alert"); - + List alerts = new ArrayList<>(); alerts.add(singleAlert); groupAlert.setAlerts(alerts); - + template = new NoticeTemplate(); template.setId(1L); template.setName("test-template"); template.setContent("test content"); - + // Set up email server configuration MailServerConfig mailServerConfig = new MailServerConfig(); mailServerConfig.setEmailHost("smtp.example.com"); @@ -106,17 +101,18 @@ class EmailAlertNotifyHandlerImplTest { mailServerConfig.setEmailUsername("sender@example.com"); mailServerConfig.setEmailPassword("password"); mailServerConfig.setEnable(true); - GeneralConfig generalConfig = GeneralConfig.builder().content("").build(); + + GeneralConfig generalConfig = GeneralConfig.builder() + .content(JsonUtil.toJson(mailServerConfig)) + .build(); when(generalConfigDao.findByType(any())).thenReturn(generalConfig); - when(objectMapper.readValue(any(String.class), eq(MailServerConfig.class))) - .thenReturn(mailServerConfig); when(mailSender.getJavaMailProperties()).thenReturn(new Properties()); } @Test public void testNotifyAlertWithInvalidEmail() { receiver.setEmail(null); - assertThrows(AlertNoticeException.class, + assertThrows(AlertNoticeException.class, () -> emailAlertNotifyHandler.send(receiver, template, groupAlert)); } @@ -131,7 +127,7 @@ class EmailAlertNotifyHandlerImplTest { @Test public void testNotifyAlertFailure() { when(mailSender.createMimeMessage()).thenThrow(new RuntimeException("Test Error")); - assertThrows(AlertNoticeException.class, + assertThrows(AlertNoticeException.class, () -> emailAlertNotifyHandler.send(receiver, template, groupAlert)); } } diff --git a/hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/service/AlertDefineJsonImExportServiceTest.java b/hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/service/AlertDefineJsonImExportServiceTest.java index d41f79c29b..d0727c0dca 100644 --- a/hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/service/AlertDefineJsonImExportServiceTest.java +++ b/hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/service/AlertDefineJsonImExportServiceTest.java @@ -19,20 +19,11 @@ package org.apache.hertzbeat.alert.service; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.IOException; import java.io.InputStream; -import java.io.OutputStream; import java.nio.charset.StandardCharsets; import java.util.List; import org.apache.hertzbeat.alert.dto.AlertDefineDTO; @@ -40,22 +31,13 @@ import org.apache.hertzbeat.alert.dto.ExportAlertDefineDTO; import org.apache.hertzbeat.alert.service.impl.AlertDefineJsonImExportServiceImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.junit.jupiter.MockitoExtension; /** * test case for {@link AlertDefineJsonImExportServiceImpl} */ -@ExtendWith(MockitoExtension.class) class AlertDefineJsonImExportServiceTest { - @Mock - private ObjectMapper objectMapper; - - @InjectMocks private AlertDefineJsonImExportServiceImpl service; @SuppressWarnings("checkstyle:OperatorWrap") @@ -68,6 +50,7 @@ class AlertDefineJsonImExportServiceTest { @BeforeEach public void setup() { + service = new AlertDefineJsonImExportServiceImpl(); inputStream = new ByteArrayInputStream(JSON_DATA.getBytes(StandardCharsets.UTF_8)); @@ -87,59 +70,43 @@ class AlertDefineJsonImExportServiceTest { } @Test - void testParseImport() throws IOException { - - when(objectMapper.readValue( - any(InputStream.class), - any(TypeReference.class)) - ).thenReturn(alertDefineList); - + void testParseImport() { List result = service.parseImport(inputStream); assertNotNull(result); assertEquals(1, result.size()); - assertEquals(alertDefineList, result); - verify(objectMapper, times(1)).readValue(any(InputStream.class), any(TypeReference.class)); + assertEquals("App1", result.get(0).getAlertDefine().getName()); + assertEquals("realtime", result.get(0).getAlertDefine().getType()); } @Test - void testParseImportFailed() throws IOException { + void testParseImportFailed() { + InputStream invalidInputStream = new ByteArrayInputStream("invalid json".getBytes(StandardCharsets.UTF_8)); - when(objectMapper.readValue( - any(InputStream.class), - any(TypeReference.class)) - ).thenThrow(new IOException("Test Exception")); + List result = service.parseImport(invalidInputStream); - RuntimeException exception = assertThrows(RuntimeException.class, () -> service.parseImport(inputStream)); - - assertEquals("import alertDefine failed", exception.getMessage()); - verify(objectMapper, times(1)).readValue(any(InputStream.class), any(TypeReference.class)); + assertNull(result); } @Test - void testWriteOs() throws IOException { - + void testWriteOs() { ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); service.writeOs(alertDefineList, outputStream); - verify(objectMapper, times(1)).writeValue(any(OutputStream.class), eq(alertDefineList)); + String result = outputStream.toString(StandardCharsets.UTF_8); + assertNotNull(result); + assertTrue(result.contains("App1")); + assertTrue(result.contains("realtime")); } @Test - void testWriteOsFailed() throws IOException { - - doThrow(new IOException("Test Exception")).when(objectMapper).writeValue(any(OutputStream.class), any()); - - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - - RuntimeException exception = assertThrows( - RuntimeException.class, - () -> service.writeOs(alertDefineList, outputStream) - ); - - assertEquals("export alertDefine failed", exception.getMessage()); - verify(objectMapper, times(1)).writeValue(any(OutputStream.class), eq(alertDefineList)); + void testType() { + assertEquals("JSON", service.type()); } + @Test + void testGetFileName() { + assertTrue(service.getFileName().endsWith(".json")); + } } diff --git a/hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/service/SmsClientFactoryTest.java b/hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/service/SmsClientFactoryTest.java index a95402129f..5a7a0fe148 100644 --- a/hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/service/SmsClientFactoryTest.java +++ b/hertzbeat-alerter/src/test/java/org/apache/hertzbeat/alert/service/SmsClientFactoryTest.java @@ -17,8 +17,6 @@ package org.apache.hertzbeat.alert.service; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.hertzbeat.common.entity.dto.sms.SmsConfig; import org.apache.hertzbeat.common.entity.dto.sms.SmslocalSmsProperties; import org.apache.hertzbeat.base.dao.GeneralConfigDao; @@ -46,9 +44,6 @@ public class SmsClientFactoryTest { @Mock private GeneralConfigDao generalConfigDao; - @Mock - private ObjectMapper objectMapper; - @Mock private SmsConfig yamlSmsConfig; @@ -57,7 +52,7 @@ public class SmsClientFactoryTest { @Test - void testloadDbConfig() throws JsonProcessingException { + void testloadDbConfig() { GeneralConfig generalConfig = new GeneralConfig(); SmsConfig smsConfig = new SmsConfig(); @@ -66,7 +61,6 @@ public class SmsClientFactoryTest { smsConfig.setSmslocal(new SmslocalSmsProperties("11")); generalConfig.setContent(JsonUtil.toJson(smsConfig)); - when(objectMapper.readValue(generalConfig.getContent(), SmsConfig.class)).thenReturn(smsConfig); when(generalConfigDao.findByType(GeneralConfigTypeEnum.sms.name())).thenReturn(generalConfig); assertNotNull(smsClientFactory.getSmsClient()); diff --git a/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/push/PushCollectImpl.java b/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/push/PushCollectImpl.java index bff901c2f5..d883d680e9 100644 --- a/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/push/PushCollectImpl.java +++ b/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/push/PushCollectImpl.java @@ -17,7 +17,6 @@ package org.apache.hertzbeat.collector.collect.push; -import com.fasterxml.jackson.core.type.TypeReference; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; @@ -48,6 +47,7 @@ import org.apache.http.client.protocol.HttpClientContext; import org.apache.http.protocol.HttpContext; import org.apache.http.util.EntityUtils; import org.springframework.http.MediaType; +import tools.jackson.core.type.TypeReference; /** * push style collect diff --git a/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/sd/HttpSdCollectImpl.java b/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/sd/HttpSdCollectImpl.java index 2e113fb03a..da4ff81639 100644 --- a/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/sd/HttpSdCollectImpl.java +++ b/hertzbeat-collector/hertzbeat-collector-basic/src/main/java/org/apache/hertzbeat/collector/collect/sd/HttpSdCollectImpl.java @@ -17,7 +17,7 @@ package org.apache.hertzbeat.collector.collect.sd; -import com.fasterxml.jackson.core.type.TypeReference; +import tools.jackson.core.type.TypeReference; import com.google.common.collect.Lists; import java.io.IOException; import java.net.MalformedURLException; diff --git a/hertzbeat-collector/hertzbeat-collector-basic/src/test/java/org/apache/hertzbeat/collector/util/CollectUtilTest.java b/hertzbeat-collector/hertzbeat-collector-basic/src/test/java/org/apache/hertzbeat/collector/util/CollectUtilTest.java index 4885cb626b..e42c83733e 100644 --- a/hertzbeat-collector/hertzbeat-collector-basic/src/test/java/org/apache/hertzbeat/collector/util/CollectUtilTest.java +++ b/hertzbeat-collector/hertzbeat-collector-basic/src/test/java/org/apache/hertzbeat/collector/util/CollectUtilTest.java @@ -21,9 +21,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonMappingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.Gson; import com.google.gson.JsonElement; import java.util.ArrayList; @@ -36,6 +33,7 @@ import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; import org.apache.hertzbeat.common.entity.job.Configmap; import org.apache.hertzbeat.common.entity.job.Metrics; +import org.apache.hertzbeat.common.util.JsonUtil; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -46,8 +44,6 @@ import org.junit.jupiter.params.provider.MethodSource; */ class CollectUtilTest { - private static final ObjectMapper JSON_MAPPER = new ObjectMapper(); - @Test void countMatchKeyword() { int keyword = CollectUtil.countMatchKeyword("hertzbeat", "e"); @@ -115,7 +111,7 @@ class CollectUtilTest { } @Test - void replaceCryPlaceholder() throws JsonMappingException, JsonProcessingException { + void replaceCryPlaceholder() { Metrics metrics = Metrics.builder().name("^o^name^o^").build(); JsonElement jsonElement = new Gson().toJsonTree(metrics); Map configmap = new HashMap<>(); @@ -125,7 +121,7 @@ class CollectUtilTest { Metrics metricsTarget = Metrics.builder().name("张三").build(); JsonElement jsonElementTarget = new Gson().toJsonTree(metricsTarget); - assertEquals(JSON_MAPPER.readTree(jsonElementTarget.toString()), JSON_MAPPER.readTree(res1.toString())); + assertEquals(JsonUtil.fromJson(jsonElementTarget.toString()), JsonUtil.fromJson(res1.toString())); List metricsList = new ArrayList<>(); metricsList.add(metrics); @@ -137,7 +133,7 @@ class CollectUtilTest { metricsListTarget.add(metricsTarget); metricsListTarget.add(metricsTarget); JsonElement jsonArrayTarget = new Gson().toJsonTree(metricsListTarget); - assertEquals(JSON_MAPPER.readTree(jsonArrayTarget.toString()), JSON_MAPPER.readTree(res2.toString())); + assertEquals(JsonUtil.fromJson(jsonArrayTarget.toString()), JsonUtil.fromJson(res2.toString())); } static Stream testParamsForShouldVerifyReplaceCryPlaceholder() { @@ -181,10 +177,10 @@ class CollectUtilTest { @MethodSource("testParamsForShouldVerifyReplaceCryPlaceholder") void shouldVerifyReplaceCryPlaceholder(JsonObject jsonObject, Map configmap, - JsonObject jsonObjectTarget) throws JsonProcessingException { + JsonObject jsonObjectTarget) { JsonElement res1 = CollectUtil.replaceCryPlaceholder(jsonObject, configmap); - assertEquals(JSON_MAPPER.readTree(jsonObjectTarget.toString()), JSON_MAPPER.readTree(res1.toString())); + assertEquals(JsonUtil.fromJson(jsonObjectTarget.toString()), JsonUtil.fromJson(res1.toString())); List metricsList = new ArrayList<>(); metricsList.add(jsonObject); @@ -195,11 +191,11 @@ class CollectUtilTest { metricsListTarget.add(jsonObjectTarget); JsonElement jsonArrayTarget = new Gson().toJsonTree(metricsListTarget); - assertEquals(JSON_MAPPER.readTree(jsonArrayTarget.toString()), JSON_MAPPER.readTree(res2.toString())); + assertEquals(JsonUtil.fromJson(jsonArrayTarget.toString()), JsonUtil.fromJson(res2.toString())); } @Test - void replaceSmilingPlaceholder() throws JsonMappingException, JsonProcessingException { + void replaceSmilingPlaceholder() { Metrics metrics = Metrics.builder().name("^_^name^_^").build(); JsonElement jsonElement = new Gson().toJsonTree(metrics); HashMap configmap = new HashMap<>(); @@ -208,7 +204,7 @@ class CollectUtilTest { JsonElement res = CollectUtil.replaceSmilingPlaceholder(jsonElement, configmap); Metrics metricsTarget = Metrics.builder().name("张三").build(); JsonElement jsonElement2 = new Gson().toJsonTree(metricsTarget); - assertEquals(JSON_MAPPER.readTree(jsonElement2.toString()), JSON_MAPPER.readTree(res.toString())); + assertEquals(JsonUtil.fromJson(jsonElement2.toString()), JsonUtil.fromJson(res.toString())); List metricsList = new ArrayList<>(); metricsList.add(metrics); @@ -220,7 +216,7 @@ class CollectUtilTest { metricsListTarget.add(metricsTarget); metricsListTarget.add(metricsTarget); JsonElement jsonArrayTarget = new Gson().toJsonTree(metricsListTarget); - assertEquals(JSON_MAPPER.readTree(jsonArrayTarget.toString()), JSON_MAPPER.readTree(res2.toString())); + assertEquals(JsonUtil.fromJson(jsonArrayTarget.toString()), JsonUtil.fromJson(res2.toString())); } @Test diff --git a/hertzbeat-collector/hertzbeat-collector-common/pom.xml b/hertzbeat-collector/hertzbeat-collector-common/pom.xml index c66fe8910f..d4cffe23fb 100644 --- a/hertzbeat-collector/hertzbeat-collector-common/pom.xml +++ b/hertzbeat-collector/hertzbeat-collector-common/pom.xml @@ -57,10 +57,6 @@ sshd-core ${sshd-core.version} - - com.fasterxml.jackson.core - jackson-core - org.apache.commons commons-lang3 @@ -85,4 +81,4 @@ gson - \ No newline at end of file + diff --git a/hertzbeat-collector/hertzbeat-collector-common/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/processor/DeleteCyclicTaskProcessor.java b/hertzbeat-collector/hertzbeat-collector-common/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/processor/DeleteCyclicTaskProcessor.java index 0499a8b2e0..bcf5dbd24d 100644 --- a/hertzbeat-collector/hertzbeat-collector-common/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/processor/DeleteCyclicTaskProcessor.java +++ b/hertzbeat-collector/hertzbeat-collector-common/src/main/java/org/apache/hertzbeat/collector/dispatch/entrance/processor/DeleteCyclicTaskProcessor.java @@ -17,7 +17,7 @@ package org.apache.hertzbeat.collector.dispatch.entrance.processor; -import com.fasterxml.jackson.core.type.TypeReference; +import tools.jackson.core.type.TypeReference; import io.netty.channel.ChannelHandlerContext; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.collector.dispatch.entrance.CollectServer; @@ -47,7 +47,7 @@ public class DeleteCyclicTaskProcessor implements NettyRemotingProcessor { return null; } for (Long jobId : jobIds) { - collectServer.getCollectJobService().cancelAsyncCollectJob(jobId); + collectServer.getCollectJobService().cancelAsyncCollectJob(jobId); } return null; } diff --git a/hertzbeat-collector/hertzbeat-collector-common/src/main/java/org/apache/hertzbeat/collector/util/CollectUtil.java b/hertzbeat-collector/hertzbeat-collector-common/src/main/java/org/apache/hertzbeat/collector/util/CollectUtil.java index 4697b22950..7d3bcabddd 100644 --- a/hertzbeat-collector/hertzbeat-collector-common/src/main/java/org/apache/hertzbeat/collector/util/CollectUtil.java +++ b/hertzbeat-collector/hertzbeat-collector-common/src/main/java/org/apache/hertzbeat/collector/util/CollectUtil.java @@ -18,7 +18,7 @@ package org.apache.hertzbeat.collector.util; import com.beetstra.jutf7.CharsetProvider; -import com.fasterxml.jackson.core.type.TypeReference; +import tools.jackson.core.type.TypeReference; import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonElement; diff --git a/hertzbeat-collector/pom.xml b/hertzbeat-collector/pom.xml index 2e24513ee2..48daddead4 100644 --- a/hertzbeat-collector/pom.xml +++ b/hertzbeat-collector/pom.xml @@ -28,7 +28,7 @@ ${project.artifactId} pom - 17 + 21 ${java.version} ${java.version} diff --git a/hertzbeat-common-core/pom.xml b/hertzbeat-common-core/pom.xml index 0121c11097..8cccffe102 100644 --- a/hertzbeat-common-core/pom.xml +++ b/hertzbeat-common-core/pom.xml @@ -131,26 +131,36 @@ ${javaparser.version} test + + + org.springframework.boot + spring-boot-starter-test + test + com.github.jsqlparser jsqlparser - com.fasterxml.jackson.core + tools.jackson.core jackson-databind - provided + com.fasterxml.jackson.core jackson-annotations - provided + - com.fasterxml.jackson.dataformat + tools.jackson.dataformat jackson-dataformat-xml - provided + + + tools.jackson.dataformat + jackson-dataformat-yaml + org.springdoc diff --git a/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/PromVectorOrMatrix.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/PromVectorOrMatrix.java index 056e11d5d9..be1ff70e6a 100644 --- a/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/PromVectorOrMatrix.java +++ b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/dto/PromVectorOrMatrix.java @@ -6,7 +6,7 @@ * (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 + * 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, @@ -17,14 +17,8 @@ package org.apache.hertzbeat.common.entity.dto; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.google.gson.JsonObject; -import java.io.IOException; import java.util.List; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; @@ -32,6 +26,11 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.ToString; import lombok.experimental.Accessors; +import tools.jackson.core.JsonParser; +import tools.jackson.databind.DeserializationContext; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.ValueDeserializer; +import tools.jackson.databind.annotation.JsonDeserialize; /** * prometheus vector or matrix entity @@ -42,6 +41,7 @@ import lombok.experimental.Accessors; @Accessors(chain = true) @ToString @Getter +@JsonIgnoreProperties(ignoreUnknown = true) public class PromVectorOrMatrix { private String status; private Data data; @@ -81,15 +81,18 @@ public class PromVectorOrMatrix { @lombok.Data @NoArgsConstructor @Accessors(chain = true) - public static class MetricJsonObjectDeserializer extends JsonDeserializer{ + public static class MetricJsonObjectDeserializer extends ValueDeserializer { @Override - public JsonObject deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException { - ObjectCodec oc = jp.getCodec(); - JsonNode node = oc.readTree(jp); + public JsonObject deserialize(JsonParser jp, DeserializationContext ctxt) { + JsonNode node = jp.objectReadContext().readTree(jp); JsonObject metric = new JsonObject(); - node.fields().forEachRemaining(entry -> metric.addProperty(entry.getKey(), entry.getValue().asText())); + if (node != null && node.isObject()) { + node.properties().forEach(entry -> + metric.addProperty(entry.getKey(), entry.getValue().asString()) + ); + } return metric; } diff --git a/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/sd/EurekaDiscoveryResponseEntity.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/sd/EurekaDiscoveryResponseEntity.java index e5471e5d2a..df316e4e85 100644 --- a/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/sd/EurekaDiscoveryResponseEntity.java +++ b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/entity/sd/EurekaDiscoveryResponseEntity.java @@ -17,15 +17,16 @@ package org.apache.hertzbeat.common.entity.sd; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; + import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import java.util.List; +import tools.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import tools.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import tools.jackson.dataformat.xml.annotation.JacksonXmlRootElement; /** * eureka service discovery entity diff --git a/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/KafkaLogEntryDeserializer.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/KafkaLogEntryDeserializer.java index ef19f4c74c..bf86a48f71 100644 --- a/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/KafkaLogEntryDeserializer.java +++ b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/KafkaLogEntryDeserializer.java @@ -17,12 +17,11 @@ package org.apache.hertzbeat.common.serialize; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import java.nio.charset.StandardCharsets; import java.util.Map; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.entity.log.LogEntry; +import org.apache.hertzbeat.common.util.JsonUtil; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.serialization.Deserializer; @@ -32,12 +31,6 @@ import org.apache.kafka.common.serialization.Deserializer; @Slf4j public class KafkaLogEntryDeserializer implements Deserializer { - private final ObjectMapper objectMapper; - - public KafkaLogEntryDeserializer() { - this.objectMapper = new ObjectMapper(); - } - @Override public void configure(Map configs, boolean isKey) { Deserializer.super.configure(configs, isKey); @@ -49,13 +42,12 @@ public class KafkaLogEntryDeserializer implements Deserializer { log.warn("Empty data received for topic: {}", topic); return null; } - try { - String jsonString = new String(data, StandardCharsets.UTF_8); - return objectMapper.readValue(jsonString, LogEntry.class); - } catch (JsonProcessingException e) { - log.error("Failed to deserialize LogEntry from JSON for topic: {}", topic, e); - return null; + String jsonString = new String(data, StandardCharsets.UTF_8); + LogEntry logEntry = JsonUtil.fromJson(jsonString, LogEntry.class); + if (logEntry == null) { + log.warn("Failed to deserialize LogEntry from topic: {}", topic); } + return logEntry; } @Override @@ -67,4 +59,4 @@ public class KafkaLogEntryDeserializer implements Deserializer { public void close() { Deserializer.super.close(); } -} \ No newline at end of file +} diff --git a/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/KafkaLogEntrySerializer.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/KafkaLogEntrySerializer.java index e64b7588a2..929b6d7484 100644 --- a/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/KafkaLogEntrySerializer.java +++ b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/KafkaLogEntrySerializer.java @@ -17,12 +17,11 @@ package org.apache.hertzbeat.common.serialize; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import java.nio.charset.StandardCharsets; import java.util.Map; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.entity.log.LogEntry; +import org.apache.hertzbeat.common.util.JsonUtil; import org.apache.kafka.common.header.Headers; import org.apache.kafka.common.serialization.Serializer; @@ -32,12 +31,6 @@ import org.apache.kafka.common.serialization.Serializer; @Slf4j public class KafkaLogEntrySerializer implements Serializer { - private final ObjectMapper objectMapper; - - public KafkaLogEntrySerializer() { - this.objectMapper = new ObjectMapper(); - } - @Override public void configure(Map configs, boolean isKey) { Serializer.super.configure(configs, isKey); @@ -49,13 +42,12 @@ public class KafkaLogEntrySerializer implements Serializer { log.warn("LogEntry is null for topic: {}", topic); return null; } - try { - String jsonString = objectMapper.writeValueAsString(logEntry); - return jsonString.getBytes(StandardCharsets.UTF_8); - } catch (JsonProcessingException e) { - log.error("Failed to serialize LogEntry to JSON for topic: {}", topic, e); + String jsonString = JsonUtil.toJson(logEntry); + if (jsonString == null) { + log.error("Failed to serialize LogEntry for topic: {}", topic); return null; } + return jsonString.getBytes(StandardCharsets.UTF_8); } @Override @@ -67,4 +59,4 @@ public class KafkaLogEntrySerializer implements Serializer { public void close() { Serializer.super.close(); } -} \ No newline at end of file +} diff --git a/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/RedisLogEntryCodec.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/RedisLogEntryCodec.java index 82d4312ca3..f8d84b3a51 100644 --- a/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/RedisLogEntryCodec.java +++ b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/serialize/RedisLogEntryCodec.java @@ -17,11 +17,11 @@ package org.apache.hertzbeat.common.serialize; -import com.fasterxml.jackson.databind.ObjectMapper; import io.lettuce.core.codec.RedisCodec; import io.netty.buffer.Unpooled; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.entity.log.LogEntry; +import org.apache.hertzbeat.common.util.JsonUtil; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; @@ -32,12 +32,6 @@ import java.nio.charset.StandardCharsets; @Slf4j public class RedisLogEntryCodec implements RedisCodec { - private final ObjectMapper objectMapper; - - public RedisLogEntryCodec() { - this.objectMapper = new ObjectMapper(); - } - @Override public String decodeKey(ByteBuffer byteBuffer) { return Unpooled.wrappedBuffer(byteBuffer).toString(StandardCharsets.UTF_8); @@ -48,13 +42,12 @@ public class RedisLogEntryCodec implements RedisCodec { if (byteBuffer == null || !byteBuffer.hasRemaining()) { return null; } - try { - String jsonString = Unpooled.wrappedBuffer(byteBuffer).toString(StandardCharsets.UTF_8); - return objectMapper.readValue(jsonString, LogEntry.class); - } catch (Exception e) { - log.error("Failed to decode LogEntry from JSON: {}", e.getMessage()); - return null; + String jsonString = Unpooled.wrappedBuffer(byteBuffer).toString(StandardCharsets.UTF_8); + LogEntry logEntry = JsonUtil.fromJson(jsonString, LogEntry.class); + if (logEntry == null) { + log.error("Failed to decode LogEntry from JSON"); } + return logEntry; } @Override @@ -64,12 +57,11 @@ public class RedisLogEntryCodec implements RedisCodec { @Override public ByteBuffer encodeValue(LogEntry logEntry) { - try { - String jsonString = objectMapper.writeValueAsString(logEntry); - return ByteBuffer.wrap(jsonString.getBytes(StandardCharsets.UTF_8)); - } catch (Exception e) { - log.error("Failed to encode LogEntry to JSON: {}", e.getMessage()); + String jsonString = JsonUtil.toJson(logEntry); + if (jsonString == null) { + log.error("Failed to encode LogEntry to JSON"); return null; } + return ByteBuffer.wrap(jsonString.getBytes(StandardCharsets.UTF_8)); } -} \ No newline at end of file +} diff --git a/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/JexlExpressionRunner.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/JexlExpressionRunner.java index d21562dc52..b3b6f7ca91 100644 --- a/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/JexlExpressionRunner.java +++ b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/JexlExpressionRunner.java @@ -19,7 +19,6 @@ package org.apache.hertzbeat.common.util; -import com.fasterxml.jackson.core.type.TypeReference; import com.google.common.collect.Maps; import org.apache.commons.jexl3.JexlBuilder; import org.apache.commons.jexl3.JexlContext; @@ -32,6 +31,7 @@ import org.apache.hertzbeat.common.constants.CommonConstants; import java.nio.charset.StandardCharsets; import java.util.Map; import java.util.function.Function; +import tools.jackson.core.type.TypeReference; /** * jexl express runner @@ -40,7 +40,7 @@ public class JexlExpressionRunner { private static final String LOADER_NAME = "jexl-class-loader"; private static final JexlEngine jexlEngine; - + static { Map functions = Maps.newLinkedHashMap(); // set the root namespace function @@ -59,7 +59,7 @@ public class JexlExpressionRunner { .features(features).strict(true).silent(false).stackOverflow(40).namespaces(functions) .create(); } - + public static Object evaluate(String expression, Map context) { JexlContext jexlContext = new MapContext(); for (Map.Entry entry : context.entrySet()) { @@ -75,11 +75,11 @@ public class JexlExpressionRunner { } return expression.evaluate(jexlContext); } - + public static Object evaluate(String expression) { return jexlEngine.createExpression(expression).evaluate(new MapContext()); } - + public static JexlExpression compile(String expression) { return jexlEngine.createExpression(expression); } diff --git a/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/JsonUtil.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/JsonUtil.java index 45854bef2e..fa0705f539 100644 --- a/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/JsonUtil.java +++ b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/JsonUtil.java @@ -19,15 +19,18 @@ package org.apache.hertzbeat.common.util; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.PropertyAccessor; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import javax.annotation.concurrent.ThreadSafe; +import java.io.InputStream; +import java.io.OutputStream; import lombok.extern.slf4j.Slf4j; +import tools.jackson.core.JacksonException; +import tools.jackson.core.type.TypeReference; +import tools.jackson.databind.DeserializationFeature; +import tools.jackson.databind.JsonNode; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.SerializationFeature; +import tools.jackson.databind.json.JsonMapper; + +import javax.annotation.concurrent.ThreadSafe; /** * json util @@ -36,27 +39,25 @@ import lombok.extern.slf4j.Slf4j; @Slf4j public final class JsonUtil { - private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); + + private static final ObjectMapper OBJECT_MAPPER = JsonMapper.builder() + .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) + .configure(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES, false) + .configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false) + .changeDefaultVisibility(vc -> vc.withVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY)) + .build(); private JsonUtil() { } - static { - OBJECT_MAPPER - .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) - .configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false) - .setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY) - .registerModule(new JavaTimeModule()); - } - public static String toJson(Object source) { if (source == null) { return null; } try { return OBJECT_MAPPER.writeValueAsString(source); - } catch (JsonProcessingException e) { - log.error(e.getMessage(), e); + } catch (JacksonException e) { + log.error("Error converting object to JSON: {}", e.getMessage(), e); return null; } } @@ -67,8 +68,8 @@ public final class JsonUtil { } try { return OBJECT_MAPPER.readValue(jsonStr, clazz); - } catch (Exception e) { - log.error(e.getMessage(), e); + } catch (JacksonException e) { + log.error("Error parsing JSON to class {}: {}", clazz.getName(), e.getMessage(), e); return null; } } @@ -79,20 +80,20 @@ public final class JsonUtil { } try { return OBJECT_MAPPER.readValue(jsonStr, type); - } catch (Exception e) { - log.error(e.getMessage(), e); + } catch (JacksonException e) { + log.error("Error parsing JSON to TypeReference: {}", e.getMessage(), e); return null; } } - + public static JsonNode fromJson(String jsonStr) { if (jsonStr == null || jsonStr.trim().isEmpty()) { return null; } try { return OBJECT_MAPPER.readTree(jsonStr); - } catch (Exception e) { - log.error(e.getMessage(), e); + } catch (JacksonException e) { + log.error("Error reading JSON tree: {}", e.getMessage(), e); return null; } } @@ -102,21 +103,18 @@ public final class JsonUtil { * @param jsonStr json string * @return true if the string is a json string */ - - public static boolean isJsonStr(String jsonStr) { if (jsonStr == null || jsonStr.trim().isEmpty()) { return false; } jsonStr = jsonStr.trim(); - if (!(jsonStr.startsWith("{") && jsonStr.endsWith("}")) - && !(jsonStr.startsWith("[") && jsonStr.endsWith("]"))) { + if (!isJsonLike(jsonStr)) { return false; } try { OBJECT_MAPPER.readTree(jsonStr); return true; - } catch (Exception ignored) { + } catch (JacksonException ignored) { return false; } } @@ -128,7 +126,7 @@ public final class JsonUtil { try { JsonNode jsonNode = OBJECT_MAPPER.readTree(jsonStr); return jsonNode.isArray(); - } catch (Exception ignore) { + } catch (JacksonException ignore) { return false; } } @@ -142,4 +140,56 @@ public final class JsonUtil { char end = jsonStr.charAt(jsonStr.length() - 1); return (start == '{' && end == '}') || (start == '[' && end == ']'); } + + /** + * Parse JSON from InputStream to object + * @param is input stream + * @param type type reference + * @return parsed object or null if error + */ + public static T fromJson(InputStream is, TypeReference type) { + if (is == null) { + return null; + } + try { + return OBJECT_MAPPER.readValue(is, type); + } catch (JacksonException e) { + log.error("Error parsing JSON from InputStream to TypeReference: {}", e.getMessage(), e); + return null; + } + } + + /** + * Write object to OutputStream as JSON + * @param source object to serialize + * @param os output stream + */ + public static void toJson(Object source, OutputStream os) { + if (source == null || os == null) { + return; + } + try { + OBJECT_MAPPER.writeValue(os, source); + } catch (JacksonException e) { + log.error("Error writing object to OutputStream as JSON: {}", e.getMessage(), e); + } + } + + /** + * Convert a value from one type to another using JSON serialization/deserialization + * @param fromValue source value + * @param toValueType target type + * @return converted value or null if error + */ + public static T convertValue(Object fromValue, Class toValueType) { + if (fromValue == null) { + return null; + } + try { + return OBJECT_MAPPER.convertValue(fromValue, toValueType); + } catch (JacksonException e) { + log.error("Error converting value to {}: {}", toValueType.getName(), e.getMessage(), e); + return null; + } + } } diff --git a/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/XmlUtil.java b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/XmlUtil.java new file mode 100644 index 0000000000..8c34040c7a --- /dev/null +++ b/hertzbeat-common-core/src/main/java/org/apache/hertzbeat/common/util/XmlUtil.java @@ -0,0 +1,77 @@ +/* + * 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. + */ + +package org.apache.hertzbeat.common.util; + + +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import tools.jackson.core.JacksonException; +import tools.jackson.core.type.TypeReference; +import tools.jackson.databind.DeserializationFeature; +import tools.jackson.databind.SerializationFeature; +import tools.jackson.dataformat.xml.XmlMapper; + +/** + * xml util + */ +@Slf4j +public class XmlUtil { + + private static final XmlMapper XML_MAPPER = XmlMapper.builder() + .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) + .configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false) + .build(); + + private XmlUtil() { + } + + /** + * Convert object to XML string + */ + public static String toXml(Object source) { + if (source == null) { + return null; + } + return XML_MAPPER.writeValueAsString(source); + } + + /** + * Convert XML string to object + */ + public static T fromXml(String xml, Class clazz) { + if (StringUtils.isEmpty(xml)) { + return null; + } + return XML_MAPPER.readValue(xml, clazz); + } + + /** + * Convert XML string to object with TypeReference + */ + public static T fromXml(String xml, TypeReference type) { + if (!StringUtils.isEmpty(xml)) { + return null; + } + try { + return XML_MAPPER.readValue(xml, type); + } catch (JacksonException e) { + log.error("Error parsing XML to TypeReference: {}", e.getMessage(), e); + return null; + } + } +} diff --git a/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/JsonUtilTest.java b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/JsonUtilTest.java index 88caafb190..bf853449e4 100644 --- a/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/JsonUtilTest.java +++ b/hertzbeat-common-core/src/test/java/org/apache/hertzbeat/common/util/JsonUtilTest.java @@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import com.fasterxml.jackson.core.type.TypeReference; +import tools.jackson.core.type.TypeReference; import java.util.Map; import org.junit.jupiter.api.Test; @@ -36,7 +36,7 @@ class JsonUtilTest { @Test void toJson() { Map map = Map.of("test", "pro"); - + assertEquals("{\"test\":\"pro\"}", JsonUtil.toJson(map)); @@ -47,7 +47,7 @@ class JsonUtilTest { void testFromJson() { assertNull(JsonUtil.fromJson("", new TypeReference<>() { })); - assertNull(JsonUtil.fromJson(null, new TypeReference<>() { + assertNull(JsonUtil.fromJson((String) null, new TypeReference<>() { })); assertNull(JsonUtil.fromJson(" ", new TypeReference<>() { })); diff --git a/hertzbeat-common-spring/pom.xml b/hertzbeat-common-spring/pom.xml index 9e6d2f9bf4..a3490af286 100644 --- a/hertzbeat-common-spring/pom.xml +++ b/hertzbeat-common-spring/pom.xml @@ -35,7 +35,7 @@ org.apache.hertzbeat hertzbeat-common-core - + org.springframework.boot @@ -52,20 +52,9 @@ spring-boot-autoconfigure - - org.eclipse.persistence - org.eclipse.persistence.jpa - ${eclipse-jpa.version} - org.springframework.boot spring-boot-starter-data-jpa - - - org.hibernate.orm - hibernate-core - - @@ -78,11 +67,6 @@ springdoc-openapi-starter-webmvc-ui provided - - - com.fasterxml.jackson.dataformat - jackson-dataformat-xml - diff --git a/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/config/EclipseLinkCustomizer.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/config/EclipseLinkCustomizer.java deleted file mode 100644 index 0804bce74b..0000000000 --- a/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/config/EclipseLinkCustomizer.java +++ /dev/null @@ -1,68 +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. - */ - -package org.apache.hertzbeat.common.config; - -import lombok.extern.slf4j.Slf4j; -import org.eclipse.persistence.config.SessionCustomizer; -import org.eclipse.persistence.descriptors.ClassDescriptor; -import org.eclipse.persistence.mappings.DatabaseMapping; -import org.eclipse.persistence.sessions.Session; - -/** - * change column name that from upper-case to lower-case-with-underscore - */ -@Slf4j -public class EclipseLinkCustomizer implements SessionCustomizer { - - @Override - public void customize(Session session) throws Exception { - for (ClassDescriptor descriptor : session.getDescriptors().values()) { - for (DatabaseMapping mapping : descriptor.getMappings()) { - if (mapping.isDirectToFieldMapping()) { - // update the column name to lower case with underscore - if (!mapping.getField().getName().equalsIgnoreCase(mapping.getAttributeName())) { - // already custom define the column name, ignore - continue; - } - // todo here i try to change column name that from upper-case to lower-case-with-underscore - // but failed, when update name, something relate exception happen more - mapping.getField().setName(convertCamelCase(mapping.getAttributeName())); - } - } - } - - } - - private String convertCamelCase(String camelCase) { - StringBuilder result = new StringBuilder(); - if (camelCase != null && !camelCase.isEmpty()) { - result.append(Character.toLowerCase(camelCase.charAt(0))); - for (int i = 1; i < camelCase.length(); i++) { - char currentChar = camelCase.charAt(i); - if (Character.isUpperCase(currentChar)) { - result.append('_').append(Character.toLowerCase(currentChar)); - } else { - result.append(currentChar); - } - } - } - return result.toString(); - } -} diff --git a/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/config/EclipseLinkJpaConfiguration.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/config/EclipseLinkJpaConfiguration.java deleted file mode 100644 index c4a7bc5c6d..0000000000 --- a/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/config/EclipseLinkJpaConfiguration.java +++ /dev/null @@ -1,61 +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. - */ - -package org.apache.hertzbeat.common.config; - -import java.util.HashMap; -import java.util.Map; -import javax.sql.DataSource; -import org.eclipse.persistence.config.PersistenceUnitProperties; -import org.springframework.beans.factory.ObjectProvider; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.autoconfigure.orm.jpa.JpaBaseConfiguration; -import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties; -import org.springframework.context.annotation.Configuration; -import org.springframework.orm.jpa.vendor.AbstractJpaVendorAdapter; -import org.springframework.orm.jpa.vendor.EclipseLinkJpaVendorAdapter; -import org.springframework.transaction.jta.JtaTransactionManager; - -/** - * jpa eclipselink impl config - */ -@Configuration -@ConditionalOnProperty(prefix = "spring.datasource", name = "url") -public class EclipseLinkJpaConfiguration extends JpaBaseConfiguration { - - protected EclipseLinkJpaConfiguration(DataSource dataSource, JpaProperties properties, - ObjectProvider jtaTransactionManager) { - super(dataSource, properties, jtaTransactionManager); - } - - @Override - protected AbstractJpaVendorAdapter createJpaVendorAdapter() { - return new EclipseLinkJpaVendorAdapter(); - } - - @Override - protected Map getVendorProperties() { - HashMap map = new HashMap<>(8); - map.put(PersistenceUnitProperties.DDL_GENERATION, "create-or-extend-tables"); - map.put(PersistenceUnitProperties.SESSION_CUSTOMIZER, "org.apache.hertzbeat.common.config.EclipseLinkCustomizer"); - map.put(PersistenceUnitProperties.ALLOW_NATIVE_SQL_QUERIES, "true"); - map.put(PersistenceUnitProperties.WEAVING, "true"); - return map; - } -} diff --git a/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/ai/ChatConversation.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/ai/ChatConversation.java index ce6129c756..62218b3fb3 100644 --- a/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/ai/ChatConversation.java +++ b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/ai/ChatConversation.java @@ -24,7 +24,6 @@ import jakarta.persistence.EntityListeners; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; -import jakarta.persistence.JoinColumn; import jakarta.persistence.OneToMany; import jakarta.persistence.Table; import org.springframework.data.annotation.CreatedBy; @@ -55,7 +54,7 @@ public class ChatConversation { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - + @Schema(title = "conversation title") private String title; @@ -78,7 +77,6 @@ public class ChatConversation { /** * List of messages in this conversation (one-to-many relationship) */ - @OneToMany - @JoinColumn(name = "conversation_id") + @OneToMany(mappedBy = "conversation") private List messages; } diff --git a/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/ai/ChatMessage.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/ai/ChatMessage.java index fc8e14d1fe..3e7568b9ac 100644 --- a/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/ai/ChatMessage.java +++ b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/ai/ChatMessage.java @@ -19,14 +19,16 @@ package org.apache.hertzbeat.common.entity.ai; import static io.swagger.v3.oas.annotations.media.Schema.AccessMode.READ_ONLY; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.EntityListeners; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.Index; +import jakarta.persistence.JoinColumn; import jakarta.persistence.Lob; - +import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; import jakarta.validation.constraints.NotBlank; import java.time.LocalDateTime; @@ -59,8 +61,14 @@ public class ChatMessage { private Long id; @Schema(title = "conversation id") + @Column(name = "conversation_id", insertable = false, updatable = false) private Long conversationId; + @Schema(title = "conversation", hidden = true) + @ManyToOne + @JoinColumn(name = "conversation_id") + private ChatConversation conversation; + @Schema(title = "message content") @Lob @NotBlank diff --git a/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/JsonMapAttributeConverter.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/JsonMapAttributeConverter.java index 23aeccc02d..f5ecf730af 100644 --- a/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/JsonMapAttributeConverter.java +++ b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/alerter/JsonMapAttributeConverter.java @@ -17,7 +17,7 @@ package org.apache.hertzbeat.common.entity.alerter; -import com.fasterxml.jackson.core.type.TypeReference; +import tools.jackson.core.type.TypeReference; import jakarta.persistence.AttributeConverter; import jakarta.persistence.Converter; import java.util.HashMap; diff --git a/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonByteListAttributeConverter.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonByteListAttributeConverter.java index 66bd7c9d24..f5b68ccc48 100644 --- a/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonByteListAttributeConverter.java +++ b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonByteListAttributeConverter.java @@ -17,7 +17,7 @@ package org.apache.hertzbeat.common.entity.manager; -import com.fasterxml.jackson.core.type.TypeReference; +import tools.jackson.core.type.TypeReference; import jakarta.persistence.AttributeConverter; import jakarta.persistence.Converter; import java.util.List; diff --git a/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonLongListAttributeConverter.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonLongListAttributeConverter.java index 8854e400b9..6717e791e7 100644 --- a/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonLongListAttributeConverter.java +++ b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonLongListAttributeConverter.java @@ -17,7 +17,7 @@ package org.apache.hertzbeat.common.entity.manager; -import com.fasterxml.jackson.core.type.TypeReference; +import tools.jackson.core.type.TypeReference; import jakarta.persistence.AttributeConverter; import jakarta.persistence.Converter; import java.util.List; diff --git a/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonMapListAttributeConverter.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonMapListAttributeConverter.java index 4a9a0530e2..62bc25a710 100644 --- a/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonMapListAttributeConverter.java +++ b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonMapListAttributeConverter.java @@ -17,13 +17,13 @@ package org.apache.hertzbeat.common.entity.manager; -import com.fasterxml.jackson.core.type.TypeReference; import jakarta.persistence.AttributeConverter; import jakarta.persistence.Converter; import java.util.List; import java.util.Map; import org.apache.hertzbeat.common.util.JsonUtil; import org.springframework.stereotype.Component; +import tools.jackson.core.type.TypeReference; /** * json map list str converter diff --git a/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonOptionListAttributeConverter.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonOptionListAttributeConverter.java index 21ac21f43b..de625e1e83 100644 --- a/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonOptionListAttributeConverter.java +++ b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonOptionListAttributeConverter.java @@ -17,7 +17,7 @@ package org.apache.hertzbeat.common.entity.manager; -import com.fasterxml.jackson.core.type.TypeReference; +import tools.jackson.core.type.TypeReference; import jakarta.persistence.AttributeConverter; import jakarta.persistence.Converter; import java.util.List; diff --git a/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonStringListAttributeConverter.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonStringListAttributeConverter.java index 4600b2fa57..5866dd3e73 100644 --- a/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonStringListAttributeConverter.java +++ b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/entity/manager/JsonStringListAttributeConverter.java @@ -17,7 +17,7 @@ package org.apache.hertzbeat.common.entity.manager; -import com.fasterxml.jackson.core.type.TypeReference; +import tools.jackson.core.type.TypeReference; import jakarta.persistence.AttributeConverter; import jakarta.persistence.Converter; import java.util.List; diff --git a/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/util/XmlUtil.java b/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/util/XmlUtil.java deleted file mode 100644 index 24334e0d07..0000000000 --- a/hertzbeat-common-spring/src/main/java/org/apache/hertzbeat/common/util/XmlUtil.java +++ /dev/null @@ -1,78 +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. - */ - -package org.apache.hertzbeat.common.util; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.dataformat.xml.XmlMapper; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import lombok.extern.slf4j.Slf4j; -import org.springframework.util.StringUtils; - -/** - * xml util - */ -@Slf4j -public class XmlUtil { - - private static final XmlMapper XML_MAPPER = new XmlMapper(); - - static { - XML_MAPPER.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) - .configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false) - .registerModule(new JavaTimeModule()); - } - - public String toXml(Object source) { - if (source == null) { - return null; - } - try { - return XML_MAPPER.writeValueAsString(source); - } catch (JsonProcessingException e) { - log.error(e.getMessage(), e); - return null; - } - } - - public static T fromXml(String xml, Class clazz) { - if (!StringUtils.hasText(xml)) { - return null; - } - try { - return XML_MAPPER.readValue(xml, clazz); - } catch (Exception e) { - log.error(e.getMessage(), e); - return null; - } - } - - public static T fromXml(String xml, TypeReference type) { - if (!StringUtils.hasText(xml)) { - return null; - } - try { - return XML_MAPPER.readValue(xml, type); - } catch (Exception e) { - log.error(e.getMessage(), e); - return null; - } - } -} diff --git a/hertzbeat-e2e/hertzbeat-collector-common-e2e/src/test/java/org/apache/hertzbeat/collector/collect/AbstractCollectE2eTest.java b/hertzbeat-e2e/hertzbeat-collector-common-e2e/src/test/java/org/apache/hertzbeat/collector/collect/AbstractCollectE2eTest.java index 7a7aa17420..b58a4423cc 100644 --- a/hertzbeat-e2e/hertzbeat-collector-common-e2e/src/test/java/org/apache/hertzbeat/collector/collect/AbstractCollectE2eTest.java +++ b/hertzbeat-e2e/hertzbeat-collector-common-e2e/src/test/java/org/apache/hertzbeat/collector/collect/AbstractCollectE2eTest.java @@ -39,6 +39,7 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; +import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -71,7 +72,7 @@ public abstract class AbstractCollectE2eTest { public void setUp() throws Exception { // Initialize mocks MockitoAnnotations.openMocks(this); - when(defineDao.findAll()).thenReturn(new ArrayList<>()); + lenient().when(defineDao.findAll()).thenReturn(new ArrayList<>()); when(timeout.task()).thenReturn(timerJob); when(timerJob.getJob()).thenReturn(job); metricsCollect = new MetricsCollect(mock(Metrics.class), timeout, mock(CollectDataDispatch.class), null, List.of()); diff --git a/hertzbeat-e2e/hertzbeat-log-e2e/pom.xml b/hertzbeat-e2e/hertzbeat-log-e2e/pom.xml index ea5b1fa1a4..c725c7bd35 100644 --- a/hertzbeat-e2e/hertzbeat-log-e2e/pom.xml +++ b/hertzbeat-e2e/hertzbeat-log-e2e/pom.xml @@ -31,8 +31,6 @@ 17 17 UTF-8 - 4.12.0 - 2.15.2 3.3.1 3.6.1 @@ -84,6 +82,11 @@ spring-boot-starter-test test + + org.springframework.boot + spring-boot-test-autoconfigure + test + diff --git a/hertzbeat-e2e/hertzbeat-log-e2e/src/test/java/org/apache/hertzbeat/log/alert/LogPeriodicAlertE2eTest.java b/hertzbeat-e2e/hertzbeat-log-e2e/src/test/java/org/apache/hertzbeat/log/alert/LogPeriodicAlertE2eTest.java index 8ad662c2b0..451f8ce778 100644 --- a/hertzbeat-e2e/hertzbeat-log-e2e/src/test/java/org/apache/hertzbeat/log/alert/LogPeriodicAlertE2eTest.java +++ b/hertzbeat-e2e/hertzbeat-log-e2e/src/test/java/org/apache/hertzbeat/log/alert/LogPeriodicAlertE2eTest.java @@ -28,10 +28,11 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.SpyBean; import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.test.context.bean.override.mockito.MockitoSpyBean; import org.springframework.test.context.DynamicPropertyRegistry; import org.springframework.test.context.DynamicPropertySource; +import org.springframework.test.context.TestPropertySource; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.Network; import org.testcontainers.containers.wait.strategy.Wait; @@ -44,6 +45,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -59,6 +61,10 @@ import static org.mockito.Mockito.doAnswer; * E2E tests for periodic log alert processing. */ @SpringBootTest(classes = org.apache.hertzbeat.startup.HertzBeatApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@TestPropertySource(properties = { + "warehouse.store.duckdb.enabled=false", + "warehouse.store.greptime.enabled=true" +}) @Slf4j @TestInstance(TestInstance.Lifecycle.PER_CLASS) public class LogPeriodicAlertE2eTest { @@ -81,7 +87,7 @@ public class LogPeriodicAlertE2eTest { AlertDefine errorCountAlertByGroup; AlertDefine errorCountAlertByIndividual; - @SpyBean + @MockitoSpyBean private AlarmCommonReduce alarmCommonReduce; static GenericContainer vector; @@ -101,9 +107,7 @@ public class LogPeriodicAlertE2eTest { @DynamicPropertySource static void greptimeProps(DynamicPropertyRegistry r) { - // Configure GreptimeDB storage - r.add("warehouse.store.duckdb.enabled", () -> "false"); - r.add("warehouse.store.greptime.enabled", () -> "true"); + // Configure GreptimeDB storage endpoints (dynamic ports) r.add("warehouse.store.greptime.http-endpoint", () -> "http://localhost:" + greptimedb.getMappedPort(GREPTIME_HTTP_PORT)); r.add("warehouse.store.greptime.grpc-endpoints", () -> "localhost:" + greptimedb.getMappedPort(GREPTIME_GRPC_PORT)); r.add("warehouse.store.greptime.username", () -> ""); @@ -111,10 +115,15 @@ public class LogPeriodicAlertE2eTest { } @BeforeAll - void setUpAll() { + void setUpAll() throws InterruptedException { // Setup test alert definitions setupTestAlertDefines(); Testcontainers.exposeHostPorts(port); + + // Wait for HertzBeat to be fully ready before starting Vector + log.info("Waiting for HertzBeat to be fully ready on port {}...", port); + Thread.sleep(5000); // Give HertzBeat time to fully initialize + vector = new GenericContainer<>(DockerImageName.parse(VECTOR_IMAGE)) .withExposedPorts(VECTOR_PORT) .withCopyFileToContainer(MountableFile.forClasspathResource("vector.yml"), VECTOR_CONFIG_PATH) @@ -171,19 +180,22 @@ public class LogPeriodicAlertE2eTest { await().atMost(Duration.ofSeconds(60)) .pollInterval(Duration.ofSeconds(3)) - .untilAsserted(() -> assertFalse(capturedGroupAlerts.isEmpty(), - "Should have generated periodic error count group alert")); + .untilAsserted(() -> { + Optional matchedAlert = capturedGroupAlerts.stream() + .flatMap(List::stream) + .filter(alert -> alert.getLabels() != null) + .filter(alert -> String.valueOf(errorCountAlertByGroup.getId()) + .equals(alert.getLabels().get(CommonConstants.LABEL_DEFINE_ID))) + .findFirst(); - List groupAlerts = capturedGroupAlerts.get(0); - - assertNotNull(groupAlerts, "Group alerts should not be null"); - assertFalse(groupAlerts.isEmpty(), "Group alerts should not be empty"); - - SingleAlert anyAlert = groupAlerts.get(0); - assertEquals(CommonConstants.ALERT_STATUS_FIRING, anyAlert.getStatus(), "Alert should be in firing status"); - assertNotNull(anyAlert.getLabels(), "Alert should have labels"); - assertEquals(CommonConstants.ALERT_SEVERITY_CRITICAL, anyAlert.getLabels().get(CommonConstants.LABEL_ALERT_SEVERITY), "Alert should have critical severity"); - assertTrue(anyAlert.getTriggerTimes() >= 1, "Alert should indicate aggregated trigger times"); + assertTrue(matchedAlert.isPresent(), "Should have captured group alert from target alert define"); + SingleAlert anyAlert = matchedAlert.get(); + assertEquals(CommonConstants.ALERT_STATUS_FIRING, anyAlert.getStatus(), "Alert should be in firing status"); + assertEquals(CommonConstants.ALERT_SEVERITY_CRITICAL, + anyAlert.getLabels().get(CommonConstants.LABEL_ALERT_SEVERITY), + "Alert should have critical severity"); + assertTrue(anyAlert.getTriggerTimes() >= 1, "Alert should indicate aggregated trigger times"); + }); } /** diff --git a/hertzbeat-e2e/hertzbeat-log-e2e/src/test/java/org/apache/hertzbeat/log/alert/LogRealTimeAlertE2eTest.java b/hertzbeat-e2e/hertzbeat-log-e2e/src/test/java/org/apache/hertzbeat/log/alert/LogRealTimeAlertE2eTest.java index 11b42b3781..ea20339128 100644 --- a/hertzbeat-e2e/hertzbeat-log-e2e/src/test/java/org/apache/hertzbeat/log/alert/LogRealTimeAlertE2eTest.java +++ b/hertzbeat-e2e/hertzbeat-log-e2e/src/test/java/org/apache/hertzbeat/log/alert/LogRealTimeAlertE2eTest.java @@ -27,8 +27,8 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.SpyBean; import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.test.context.bean.override.mockito.MockitoSpyBean; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.Network; import org.testcontainers.containers.wait.strategy.Wait; @@ -64,7 +64,8 @@ public class LogRealTimeAlertE2eTest { private static final int VECTOR_PORT = 8686; private static final String VECTOR_CONFIG_PATH = "/etc/vector/vector.yml"; private static final String ENV_HERTZBEAT_PORT = "HERTZBEAT_PORT"; - private static final Duration CONTAINER_STARTUP_TIMEOUT = Duration.ofSeconds(120); + private static final Duration CONTAINER_STARTUP_TIMEOUT = Duration.ofSeconds(180); + private static final Duration TEST_WAIT_TIMEOUT = Duration.ofSeconds(120); @LocalServerPort private int port; @@ -72,18 +73,23 @@ public class LogRealTimeAlertE2eTest { private final List capturedAlerts = new ArrayList<>(); private final ArrayList> capturedGroupAlerts = new ArrayList<>(); - @SpyBean + @MockitoSpyBean private AlarmCommonReduce alarmCommonReduce; static GenericContainer vector; @BeforeAll - void setUpAll() { + void setUpAll() throws InterruptedException { // Setup test alert definitions setupTestAlertDefines(); - + // Expose host ports for testcontainers Testcontainers.exposeHostPorts(port); + + // Wait for HertzBeat to be fully ready before starting Vector + log.info("Waiting for HertzBeat to be fully ready on port {}...", port); + Thread.sleep(5000); // Give HertzBeat time to fully initialize + vector = new GenericContainer<>(DockerImageName.parse(VECTOR_IMAGE)) .withExposedPorts(VECTOR_PORT) .withCopyFileToContainer(MountableFile.forClasspathResource("vector.yml"), VECTOR_CONFIG_PATH) @@ -107,8 +113,8 @@ public class LogRealTimeAlertE2eTest { capturedAlerts.clear(); // Wait for real alert to be generated through AlarmCommonReduce - await().atMost(Duration.ofSeconds(60)) - .pollInterval(Duration.ofSeconds(2)) + await().atMost(TEST_WAIT_TIMEOUT) + .pollInterval(Duration.ofSeconds(3)) .untilAsserted(() -> assertFalse(capturedAlerts.isEmpty(), "Should have generated at least one alert for error logs")); diff --git a/hertzbeat-e2e/hertzbeat-log-e2e/src/test/java/org/apache/hertzbeat/log/ingestion/LogIngestionE2eTest.java b/hertzbeat-e2e/hertzbeat-log-e2e/src/test/java/org/apache/hertzbeat/log/ingestion/LogIngestionE2eTest.java index dd95522405..30cab016d1 100644 --- a/hertzbeat-e2e/hertzbeat-log-e2e/src/test/java/org/apache/hertzbeat/log/ingestion/LogIngestionE2eTest.java +++ b/hertzbeat-e2e/hertzbeat-log-e2e/src/test/java/org/apache/hertzbeat/log/ingestion/LogIngestionE2eTest.java @@ -64,8 +64,13 @@ public class LogIngestionE2eTest { static GenericContainer vector; @BeforeAll - void setUpAll() { + void setUpAll() throws InterruptedException { Testcontainers.exposeHostPorts(port); + + // Wait for HertzBeat to be fully ready before starting Vector + log.info("Waiting for HertzBeat to be fully ready on port {}...", port); + Thread.sleep(5000); // Give HertzBeat time to fully initialize + vector = new GenericContainer<>(DockerImageName.parse(VECTOR_IMAGE)) .withExposedPorts(VECTOR_PORT) .withCopyFileToContainer(MountableFile.forClasspathResource("vector.yml"), VECTOR_CONFIG_PATH) diff --git a/hertzbeat-e2e/hertzbeat-log-e2e/src/test/java/org/apache/hertzbeat/log/storage/GreptimeLogStorageE2eTest.java b/hertzbeat-e2e/hertzbeat-log-e2e/src/test/java/org/apache/hertzbeat/log/storage/GreptimeLogStorageE2eTest.java index 23dc0c02db..9a0fbaea31 100644 --- a/hertzbeat-e2e/hertzbeat-log-e2e/src/test/java/org/apache/hertzbeat/log/storage/GreptimeLogStorageE2eTest.java +++ b/hertzbeat-e2e/hertzbeat-log-e2e/src/test/java/org/apache/hertzbeat/log/storage/GreptimeLogStorageE2eTest.java @@ -29,6 +29,10 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.test.context.DynamicPropertyRegistry; import org.springframework.test.context.DynamicPropertySource; +import org.springframework.test.context.TestPropertySource; + +import java.util.ArrayList; +import java.util.List; import org.testcontainers.containers.GenericContainer; import org.testcontainers.containers.Network; import org.testcontainers.containers.wait.strategy.Wait; @@ -37,8 +41,6 @@ import org.testcontainers.utility.DockerImageName; import org.testcontainers.utility.MountableFile; import java.time.Duration; -import java.util.ArrayList; -import java.util.List; import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -48,6 +50,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; * E2E tests for GreptimeDB log storage. */ @SpringBootTest(classes = org.apache.hertzbeat.startup.HertzBeatApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@TestPropertySource(properties = { + "warehouse.store.duckdb.enabled=false", + "warehouse.store.greptime.enabled=true" +}) @Slf4j @TestInstance(TestInstance.Lifecycle.PER_CLASS) public class GreptimeLogStorageE2eTest { @@ -86,8 +92,6 @@ public class GreptimeLogStorageE2eTest { @DynamicPropertySource static void greptimeProps(DynamicPropertyRegistry r) { - r.add("warehouse.store.duckdb.enabled", () -> "false"); - r.add("warehouse.store.greptime.enabled", () -> "true"); r.add("warehouse.store.greptime.http-endpoint", () -> "http://localhost:" + greptimedb.getMappedPort(GREPTIME_HTTP_PORT)); r.add("warehouse.store.greptime.grpc-endpoints", () -> "localhost:" + greptimedb.getMappedPort(GREPTIME_GRPC_PORT)); r.add("warehouse.store.greptime.username", () -> ""); @@ -96,10 +100,14 @@ public class GreptimeLogStorageE2eTest { @BeforeAll - void setUpAll() { + void setUpAll() throws InterruptedException { // Expose host ports for testcontainers Testcontainers.exposeHostPorts(port); + // Wait for HertzBeat to be fully ready before starting Vector + log.info("Waiting for HertzBeat to be fully ready on port {}...", port); + Thread.sleep(5000); // Give HertzBeat time to fully initialize + vector = new GenericContainer<>(DockerImageName.parse(VECTOR_IMAGE)) .withExposedPorts(VECTOR_PORT) .withCopyFileToContainer(MountableFile.forClasspathResource("vector.yml"), VECTOR_CONFIG_PATH) @@ -114,9 +122,10 @@ public class GreptimeLogStorageE2eTest { @Test void testLogStorageToGreptimeDb() { + log.info("GreptimeDbDataStorage serverAvailable: {}", greptimeDbDataStorage.isServerAvailable()); List capturedLogs = new ArrayList<>(); - + // Wait for Vector to generate and send logs to HertzBeat await().atMost(Duration.ofSeconds(30)) .pollInterval(Duration.ofSeconds(3)) @@ -131,7 +140,7 @@ public class GreptimeLogStorageE2eTest { Thread.currentThread().interrupt(); throw new RuntimeException("Test interrupted", e); } - + // Assert that we have captured at least some logs assertFalse(capturedLogs.isEmpty(), "Should have captured at least one log entry"); }); @@ -142,13 +151,25 @@ public class GreptimeLogStorageE2eTest { assertNotNull(firstLog, "First log should not be null"); assertNotNull(firstLog.getBody(), "Log body should not be null"); assertNotNull(firstLog.getSeverityText(), "Severity text should not be null"); - + + // Directly write logs to GreptimeDB to test storage functionality + log.info("Directly writing {} captured logs to GreptimeDB", capturedLogs.size()); + greptimeDbDataStorage.saveLogDataBatch(capturedLogs); + + // Give some time for the write to complete + try { + Thread.sleep(2000); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } + // Additional wait to ensure logs are persisted to GreptimeDB await().atMost(Duration.ofSeconds(30)) .pollInterval(Duration.ofSeconds(2)) .untilAsserted(() -> { // Query GreptimeDB directly to verify data persistence List storedLogs = queryStoredLogs(); + log.info("Queried {} logs from GreptimeDB", storedLogs.size()); assertFalse(storedLogs.isEmpty(), "Should have logs stored in GreptimeDB"); }); } @@ -157,10 +178,10 @@ public class GreptimeLogStorageE2eTest { * Helper method to query stored logs directly from GreptimeDB */ private List queryStoredLogs() { - long endTime = System.currentTimeMillis(); - long startTime = endTime - Duration.ofMinutes(5).toMillis(); // Look back 5 minutes - - return greptimeDbDataStorage.queryLogsByMultipleConditions( - startTime, endTime, null, null, null, null, null); + // Query without time condition to verify data exists + List result = greptimeDbDataStorage.queryLogsByMultipleConditions( + null, null, null, null, null, null, null); + log.info("queryLogsByMultipleConditions returned {} entries", result.size()); + return result; } } diff --git a/hertzbeat-e2e/hertzbeat-log-e2e/src/test/resources/vector.yml b/hertzbeat-e2e/hertzbeat-log-e2e/src/test/resources/vector.yml index 6d1000b93c..d0add7ed93 100644 --- a/hertzbeat-e2e/hertzbeat-log-e2e/src/test/resources/vector.yml +++ b/hertzbeat-e2e/hertzbeat-log-e2e/src/test/resources/vector.yml @@ -95,8 +95,8 @@ sinks: type: console encoding: codec: json - - # Send to HertzBeat + + # Send to HertzBeat with increased timeout and retry emit_syslog: inputs: [ "remap_syslog" ] type: opentelemetry @@ -114,4 +114,13 @@ sinks: strategy: basic user: admin password: hertzbeat - + # Increase timeout and retry settings for stability in CI environments + request: + timeout_secs: 60 + retry_attempts: 10 + retry_initial_backoff_secs: 2 + retry_max_duration_secs: 120 + # Batch settings for better throughput + batch: + max_bytes: 524288 + timeout_secs: 5 diff --git a/hertzbeat-grafana/pom.xml b/hertzbeat-grafana/pom.xml index 1e20a2fe33..97b42963d0 100644 --- a/hertzbeat-grafana/pom.xml +++ b/hertzbeat-grafana/pom.xml @@ -42,6 +42,11 @@ org.apache.hertzbeat hertzbeat-warehouse + + + org.apache.hertzbeat + hertzbeat-common-core + org.springframework.boot diff --git a/hertzbeat-grafana/src/main/java/org/apache/hertzbeat/grafana/service/DashboardService.java b/hertzbeat-grafana/src/main/java/org/apache/hertzbeat/grafana/service/DashboardService.java index 293f82f529..95642e6203 100644 --- a/hertzbeat-grafana/src/main/java/org/apache/hertzbeat/grafana/service/DashboardService.java +++ b/hertzbeat-grafana/src/main/java/org/apache/hertzbeat/grafana/service/DashboardService.java @@ -17,8 +17,7 @@ package org.apache.hertzbeat.grafana.service; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.JsonNode; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.hertzbeat.base.dao.GeneralConfigDao; @@ -77,8 +76,6 @@ public class DashboardService { @Autowired private GeneralConfigDao generalConfigDao; - private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper(); - /** * Creates or updates a dashboard in Grafana. * The "id" field will be removed from the dashboard JSON before sending @@ -275,7 +272,10 @@ public class DashboardService { try { GeneralConfig config = generalConfigDao.findByType(GeneralConfigTypeEnum.system.name()); if (config != null && config.getContent() != null) { - JsonNode root = OBJECT_MAPPER.readTree(config.getContent()); + JsonNode root = JsonUtil.fromJson(config.getContent()); + if (root == null) { + return ThemeEnum.LIGHT.getValue(); + } JsonNode node = root.get("theme"); if (node != null && !node.isNull()) { return ThemeEnum.convert(node.asText()); diff --git a/hertzbeat-grafana/src/main/java/org/apache/hertzbeat/grafana/service/ServiceAccountService.java b/hertzbeat-grafana/src/main/java/org/apache/hertzbeat/grafana/service/ServiceAccountService.java index bb0be32315..7e1e251d7d 100644 --- a/hertzbeat-grafana/src/main/java/org/apache/hertzbeat/grafana/service/ServiceAccountService.java +++ b/hertzbeat-grafana/src/main/java/org/apache/hertzbeat/grafana/service/ServiceAccountService.java @@ -23,7 +23,7 @@ import static org.apache.hertzbeat.grafana.common.GrafanaConstants.CREATE_SERVIC import static org.apache.hertzbeat.grafana.common.GrafanaConstants.CREATE_SERVICE_TOKEN_API; import static org.apache.hertzbeat.grafana.common.GrafanaConstants.GET_SERVICE_ACCOUNTS_API; import static org.apache.hertzbeat.grafana.common.GrafanaConstants.GRAFANA_CONFIG; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import jakarta.annotation.PostConstruct; import java.nio.charset.StandardCharsets; diff --git a/hertzbeat-manager/pom.xml b/hertzbeat-manager/pom.xml index 1bdae24887..57994eac2d 100644 --- a/hertzbeat-manager/pom.xml +++ b/hertzbeat-manager/pom.xml @@ -27,7 +27,7 @@ ${project.artifactId} jar - + @@ -138,10 +138,10 @@ spring-boot-starter-jdbc - - org.flywaydb - flyway-core - + + org.springframework.boot + spring-boot-starter-flyway + org.flywaydb flyway-mysql diff --git a/hertzbeat-manager/src/main/java/com/usthe/sureness/configuration/SurenessJakartaServletFilter.java b/hertzbeat-manager/src/main/java/com/usthe/sureness/configuration/SurenessJakartaServletFilter.java new file mode 100644 index 0000000000..008fe74f36 --- /dev/null +++ b/hertzbeat-manager/src/main/java/com/usthe/sureness/configuration/SurenessJakartaServletFilter.java @@ -0,0 +1,147 @@ +/* + * 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. + */ + +package com.usthe.sureness.configuration; + +import com.usthe.sureness.mgt.SecurityManager; +import com.usthe.sureness.processor.exception.DisabledAccountException; +import com.usthe.sureness.processor.exception.ExcessiveAttemptsException; +import com.usthe.sureness.processor.exception.ExpiredCredentialsException; +import com.usthe.sureness.processor.exception.IncorrectCredentialsException; +import com.usthe.sureness.processor.exception.NeedDigestInfoException; +import com.usthe.sureness.processor.exception.UnauthorizedException; +import com.usthe.sureness.processor.exception.UnknownAccountException; +import com.usthe.sureness.subject.SubjectSum; +import com.usthe.sureness.util.SurenessContextHolder; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletResponse; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; + +import java.io.IOException; +import java.io.PrintWriter; + +/** + * Override the default servlet filter + */ +public class SurenessJakartaServletFilter implements Filter { + + private final SecurityManager securityManager; + + public SurenessJakartaServletFilter(SecurityManager securityManager) { + this.securityManager = securityManager; + } + + /** logger **/ + private static final Logger logger = LoggerFactory.getLogger(SurenessJakartaServletFilter.class); + + private static final String UPGRADE = "Upgrade"; + + private static final String WEBSOCKET = "websocket"; + + @Override + public void init(FilterConfig filterConfig) { + logger.info("servlet surenessFilter initialized"); + } + + @Override + public void destroy() { + logger.info("servlet surenessFilter destroyed"); + } + + @Override + public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, + FilterChain filterChain) + throws IOException, ServletException { + + try { + SubjectSum subject = securityManager.checkIn(servletRequest); + // You can consider using SurenessContextHolder to bind subject in threadLocal + // if bind, please remove it when end + if (subject != null) { + SurenessContextHolder.bindSubject(subject); + } + } catch (IncorrectCredentialsException | UnknownAccountException | ExpiredCredentialsException e1) { + logger.debug("this request account info is illegal, {}", e1.getMessage()); + responseWrite(ResponseEntity + .status(HttpStatus.UNAUTHORIZED) + .body("Username or password is incorrect or token expired"), servletResponse); + return; + } catch (DisabledAccountException | ExcessiveAttemptsException e2) { + logger.debug("the account is disabled, {}", e2.getMessage()); + responseWrite(ResponseEntity + .status(HttpStatus.UNAUTHORIZED).body("Account is disabled"), servletResponse); + return; + } catch (NeedDigestInfoException e3) { + logger.debug("you should try once again with digest auth information"); + responseWrite(ResponseEntity + .status(HttpStatus.UNAUTHORIZED) + .header("WWW-Authenticate", e3.getAuthenticate()).build(), servletResponse); + return; + } catch (UnauthorizedException e4) { + logger.debug("this account can not access this resource, {}", e4.getMessage()); + responseWrite(ResponseEntity + .status(HttpStatus.FORBIDDEN) + .body("This account has no permission to access this resource"), servletResponse); + return; + } catch (RuntimeException e) { + logger.error("other exception happen: ", e); + responseWrite(ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build(), + servletResponse); + return; + } + + try { + // if ok, doFilter and add subject in request + filterChain.doFilter(servletRequest, servletResponse); + } finally { + int statusCode = ((HttpServletResponse) servletResponse).getStatus(); + String upgrade = ((HttpServletResponse) servletResponse).getHeader(UPGRADE); + if (statusCode != HttpStatus.SWITCHING_PROTOCOLS.value() || !WEBSOCKET.equals(upgrade)) { + SurenessContextHolder.clear(); + } + } + } + + /** + * write response json data + * @param content content + * @param response response + */ + private static void responseWrite(ResponseEntity content, ServletResponse response) { + response.setCharacterEncoding("UTF-8"); + ((HttpServletResponse) response).setStatus(content.getStatusCode().value()); + content.getHeaders().forEach((key, value) -> + ((HttpServletResponse) response).addHeader(key, value.get(0))); + try (PrintWriter printWriter = response.getWriter()) { + if (content.getBody() != null) { + printWriter.write(content.getBody().toString()); + } else { + printWriter.flush(); + } + } catch (IOException e) { + logger.error("responseWrite response error: ", e); + } + } +} diff --git a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/component/listener/TimeZoneListener.java b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/component/listener/TimeZoneListener.java deleted file mode 100644 index 2801ab7c85..0000000000 --- a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/component/listener/TimeZoneListener.java +++ /dev/null @@ -1,47 +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. - */ - -package org.apache.hertzbeat.manager.component.listener; - -import com.fasterxml.jackson.databind.ObjectMapper; -import jakarta.annotation.Resource; -import java.text.SimpleDateFormat; -import java.util.TimeZone; -import lombok.extern.slf4j.Slf4j; -import org.apache.hertzbeat.common.support.event.SystemConfigChangeEvent; -import org.springframework.context.event.EventListener; -import org.springframework.stereotype.Component; - -/** - * Listener for config Jackson timezone - */ -@Slf4j -@Component -public class TimeZoneListener { - @Resource - private ObjectMapper objectMapper; - - @EventListener(SystemConfigChangeEvent.class) - public void onEvent(SystemConfigChangeEvent event) { - log.info("{} receive system config change event: {}.", this.getClass().getName(), event.getSource()); - - final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSX"); - simpleDateFormat.setTimeZone(TimeZone.getDefault()); - objectMapper.setTimeZone(TimeZone.getDefault()) - .setDateFormat(simpleDateFormat); - } -} diff --git a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/component/validator/impl/JsonParamValidator.java b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/component/validator/impl/JsonParamValidator.java index 1a9b3ba8a9..f9786ac70f 100644 --- a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/component/validator/impl/JsonParamValidator.java +++ b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/component/validator/impl/JsonParamValidator.java @@ -17,7 +17,7 @@ package org.apache.hertzbeat.manager.component.validator.impl; -import com.fasterxml.jackson.core.type.TypeReference; +import tools.jackson.core.type.TypeReference; import org.apache.hertzbeat.common.entity.manager.Param; import org.apache.hertzbeat.common.entity.manager.ParamDefine; import org.apache.hertzbeat.common.util.JsonUtil; diff --git a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/config/AngularErrorViewResolver.java b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/config/AngularErrorViewResolver.java index 15d9a73707..414265dafe 100644 --- a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/config/AngularErrorViewResolver.java +++ b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/config/AngularErrorViewResolver.java @@ -26,7 +26,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.template.TemplateAvailabilityProvider; import org.springframework.boot.autoconfigure.template.TemplateAvailabilityProviders; import org.springframework.boot.autoconfigure.web.WebProperties; -import org.springframework.boot.autoconfigure.web.servlet.error.ErrorViewResolver; +import org.springframework.boot.webmvc.autoconfigure.error.ErrorViewResolver; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; diff --git a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/config/ConfigInitializer.java b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/config/ConfigInitializer.java index 35d48c0fa9..fca66f8871 100644 --- a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/config/ConfigInitializer.java +++ b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/config/ConfigInitializer.java @@ -6,7 +6,7 @@ * (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 + * 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, @@ -17,7 +17,6 @@ package org.apache.hertzbeat.manager.config; -import com.fasterxml.jackson.databind.ObjectMapper; import com.usthe.sureness.util.JsonWebTokenUtil; import jakarta.annotation.Resource; import java.security.SecureRandom; @@ -29,6 +28,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.hertzbeat.common.constants.CommonConstants; import org.apache.hertzbeat.common.entity.manager.GeneralConfig; import org.apache.hertzbeat.common.util.AesUtil; +import org.apache.hertzbeat.common.util.JsonUtil; import org.apache.hertzbeat.common.util.TimeZoneUtil; import org.apache.hertzbeat.base.dao.GeneralConfigDao; import org.apache.hertzbeat.manager.pojo.dto.MuteConfig; @@ -56,9 +56,9 @@ public class ConfigInitializer implements SmartLifecycle { private boolean running = false; private static final String DEFAULT_JWT_SECRET = "CyaFv0bwq2Eik0jdrKUtsA6bx3sDJeFV643R " - + "LnfKefTjsIfJLBa2YkhEqEGtcHDTNe4CU6+9 " - + "8tVt4bisXQ13rbN0oxhUZR73M6EByXIO+SV5 " - + "dKhaX0csgOCTlCxq20yhmUea6H6JIpSE2Rwp"; + + "LnfKefTjsIfJLBa2YkhEqEGtcHDTNe4CU6+9 " + + "8tVt4bisXQ13rbN0oxhUZR73M6EByXIO+SV5 " + + "dKhaX0csgOCTlCxq20yhmUea6H6JIpSE2Rwp"; @Value("${sureness.jwt.secret:" + DEFAULT_JWT_SECRET + "}") private String currentJwtSecret; @@ -84,9 +84,6 @@ public class ConfigInitializer implements SmartLifecycle { @Resource protected GeneralConfigDao generalConfigDao; - @Resource - protected ObjectMapper objectMapper; - @SneakyThrows public void initConfig() { // for system config @@ -96,19 +93,17 @@ public class ConfigInitializer implements SmartLifecycle { final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSX"); simpleDateFormat.setTimeZone(TimeZone.getDefault()); - objectMapper.setTimeZone(TimeZone.getDefault()) - .setDateFormat(simpleDateFormat); } else { // init system config data systemConfig = SystemConfig.builder().timeZoneId(TimeZone.getDefault().getID()).theme("default") - .locale(Locale.getDefault().getLanguage() + CommonConstants.LOCALE_SEPARATOR - + Locale.getDefault().getCountry()) - .build(); - String contentJson = objectMapper.writeValueAsString(systemConfig); + .locale(Locale.getDefault().getLanguage() + CommonConstants.LOCALE_SEPARATOR + + Locale.getDefault().getCountry()) + .build(); + String contentJson = JsonUtil.toJson(systemConfig); GeneralConfig generalConfig2Save = GeneralConfig.builder() - .type(systemGeneralConfigService.type()) - .content(contentJson) - .build(); + .type(systemGeneralConfigService.type()) + .content(contentJson) + .build(); generalConfigDao.save(generalConfig2Save); } // for template config, flush the template config in db to memory diff --git a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/config/FlywayConfiguration.java b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/config/FlywayConfiguration.java index b3437e3bd7..394767407e 100644 --- a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/config/FlywayConfiguration.java +++ b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/config/FlywayConfiguration.java @@ -19,28 +19,35 @@ package org.apache.hertzbeat.manager.config; import org.flywaydb.core.Flyway; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.autoconfigure.flyway.FlywayMigrationInitializer; -import org.springframework.boot.autoconfigure.flyway.FlywayProperties; +import org.springframework.boot.flyway.autoconfigure.FlywayMigrationInitializer; +import org.springframework.boot.flyway.autoconfigure.FlywayProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.DependsOn; /** - * flyway database migration config + * Flyway database migration config. + * Delays Flyway execution until after Hibernate has created/updated the schema. */ @Configuration @ConditionalOnProperty(prefix = "spring.flyway", name = "enabled", havingValue = "true") public class FlywayConfiguration { + /** + * Disable the default FlywayMigrationInitializer by providing an empty callback. + */ @Bean public FlywayMigrationInitializer flywayInitializer(Flyway flyway) { return new FlywayMigrationInitializer(flyway, (f) -> { + // Empty callback - we'll run migrations manually after Hibernate }); } - static class Dummy { - } - + /** + * Delayed Flyway migration that runs after EntityManagerFactory is initialized. + * This ensures Hibernate's ddl-auto runs first to create/update tables, + * then Flyway can perform additional migrations if needed. + */ @Bean @DependsOn("entityManagerFactory") Dummy delayedFlywayInitializer(Flyway flyway, FlywayProperties flywayProperties) { @@ -49,4 +56,7 @@ public class FlywayConfiguration { } return new Dummy(); } + + static class Dummy { + } } diff --git a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/config/JacksonConfig.java b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/config/JacksonConfig.java index 3c22dcf536..efd032d51d 100644 --- a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/config/JacksonConfig.java +++ b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/config/JacksonConfig.java @@ -6,7 +6,7 @@ * (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 + * 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, @@ -17,39 +17,32 @@ package org.apache.hertzbeat.manager.config; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import java.text.SimpleDateFormat; -import java.util.TimeZone; -import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; +import org.springframework.boot.jackson.autoconfigure.JsonMapperBuilderCustomizer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; +import tools.jackson.databind.DeserializationFeature; + +import java.text.SimpleDateFormat; +import java.util.TimeZone; /** - * jackson config + * Jackson config. */ -@Slf4j @Configuration public class JacksonConfig { @Bean - public Jackson2ObjectMapperBuilderCustomizer jacksonCustomizer() { + public JsonMapperBuilderCustomizer jsonMapperBuilderCustomizer() { return builder -> { - JavaTimeModule javaTimeModule = new JavaTimeModule(); - final SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSX"); + final String dateTimeFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSX"; + final SimpleDateFormat simpleDateFormat = new SimpleDateFormat(dateTimeFormat); simpleDateFormat.setTimeZone(TimeZone.getDefault()); - builder.modules(javaTimeModule) - .timeZone(TimeZone.getDefault()) - .dateFormat(simpleDateFormat); + builder.defaultTimeZone(TimeZone.getDefault()); + builder.defaultDateFormat(simpleDateFormat); + + builder.disable(DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES); + builder.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); }; } - - @Bean - public ObjectMapper objectMapper(Jackson2ObjectMapperBuilder builder) { - return builder.build(); - } - } diff --git a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/config/RestTemplateConfig.java b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/config/RestTemplateConfig.java index d856c1d9b7..8930dd35cc 100644 --- a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/config/RestTemplateConfig.java +++ b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/config/RestTemplateConfig.java @@ -6,7 +6,7 @@ * (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 + * 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, @@ -17,24 +17,25 @@ package org.apache.hertzbeat.manager.config; +import java.net.http.HttpClient; +import java.time.Duration; import java.util.Collections; -import java.util.concurrent.TimeUnit; -import okhttp3.ConnectionPool; -import okhttp3.OkHttpClient; import org.apache.hertzbeat.common.constants.NetworkConstants; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.client.ClientHttpRequestFactory; -import org.springframework.http.client.OkHttp3ClientHttpRequestFactory; +import org.springframework.http.client.JdkClientHttpRequestFactory; import org.springframework.web.client.RestTemplate; /** - * restTemplate config - * todo thread pool + * RestTemplate configuration using JDK native HttpClient for Spring 7.0. */ @Configuration public class RestTemplateConfig { + /** + * Create RestTemplate with JDK native request factory and custom interceptors. + */ @Bean public RestTemplate restTemplate(ClientHttpRequestFactory factory) { RestTemplate restTemplate = new RestTemplate(factory); @@ -43,19 +44,17 @@ public class RestTemplateConfig { } @Bean - public ClientHttpRequestFactory simpleClientHttpRequestFactory() { + public ClientHttpRequestFactory clientHttpRequestFactory() { + HttpClient httpClient = HttpClient.newBuilder() + .connectTimeout(Duration.ofSeconds(NetworkConstants.HttpClientConstants.CONNECT_TIME_OUT)) + .followRedirects(HttpClient.Redirect.NORMAL) + .build(); - return new OkHttp3ClientHttpRequestFactory( - new OkHttpClient.Builder() - .readTimeout(NetworkConstants.HttpClientConstants.READ_TIME_OUT, TimeUnit.SECONDS) - .writeTimeout(NetworkConstants.HttpClientConstants.WRITE_TIME_OUT, TimeUnit.SECONDS) - .connectTimeout(NetworkConstants.HttpClientConstants.CONNECT_TIME_OUT, TimeUnit.SECONDS) - .connectionPool(new ConnectionPool( - NetworkConstants.HttpClientConstants.MAX_IDLE_CONNECTIONS, - NetworkConstants.HttpClientConstants.KEEP_ALIVE_TIMEOUT, - TimeUnit.SECONDS) - ).build() - ); + JdkClientHttpRequestFactory factory = new JdkClientHttpRequestFactory(httpClient); + + factory.setReadTimeout(Duration.ofSeconds(NetworkConstants.HttpClientConstants.READ_TIME_OUT)); + + return factory; } } diff --git a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AbstractGeneralConfigServiceImpl.java b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AbstractGeneralConfigServiceImpl.java index d67423d949..41b649d5b1 100644 --- a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AbstractGeneralConfigServiceImpl.java +++ b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AbstractGeneralConfigServiceImpl.java @@ -17,14 +17,13 @@ package org.apache.hertzbeat.manager.service.impl; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; -import org.apache.hertzbeat.common.entity.manager.GeneralConfig; import org.apache.hertzbeat.base.dao.GeneralConfigDao; import org.apache.hertzbeat.base.service.GeneralConfigService; +import org.apache.hertzbeat.common.entity.manager.GeneralConfig; +import org.apache.hertzbeat.common.util.JsonUtil; import org.springframework.transaction.annotation.Transactional; +import tools.jackson.core.type.TypeReference; /** *

Abstract implementation of GeneralConfigService, providing CRUD operations for configurations.

@@ -34,61 +33,35 @@ abstract class AbstractGeneralConfigServiceImpl implements GeneralConfigServi protected final GeneralConfigDao generalConfigDao; - protected final ObjectMapper objectMapper; - - /** - *

Constructor, passing in GeneralConfigDao, ObjectMapper and type.

- * @param generalConfigDao Dao object - * @param objectMapper JSON tool object - */ - protected AbstractGeneralConfigServiceImpl(GeneralConfigDao generalConfigDao, ObjectMapper objectMapper) { + protected AbstractGeneralConfigServiceImpl(GeneralConfigDao generalConfigDao) { this.generalConfigDao = generalConfigDao; - this.objectMapper = objectMapper; } - /** - *

Save a configuration.

- * @param config need to save configuration object - */ @Transactional(rollbackFor = Exception.class) @Override public void saveConfig(T config) { - try { - String contentJson = objectMapper.writeValueAsString(config); - - GeneralConfig generalConfig2Save = GeneralConfig.builder() - .type(type()) - .content(contentJson) - .build(); - generalConfigDao.save(generalConfig2Save); - log.info("Configuration saved successfully"); - handler(getConfig()); - } catch (JsonProcessingException e) { - throw new IllegalArgumentException("Configuration saved failed: " + e.getMessage()); + String contentJson = JsonUtil.toJson(config); + if (contentJson == null) { + log.error("Failed to serialize configuration for type {}", type()); + throw new RuntimeException("Save config failed: serialization error"); } + GeneralConfig generalConfig2Save = GeneralConfig.builder() + .type(type()) + .content(contentJson) + .build(); + generalConfigDao.save(generalConfig2Save); + log.info("Configuration of type {} saved successfully", type()); + handler(getConfig()); } - /** - *

Get a configuration.

- * @return query configuration object - */ @Override public T getConfig() { GeneralConfig generalConfig = generalConfigDao.findByType(type()); if (generalConfig == null) { return null; } - try { - return objectMapper.readValue(generalConfig.getContent(), getTypeReference()); - } catch (JsonProcessingException e) { - throw new IllegalArgumentException("Get configuration failed: " + e.getMessage()); - } + return JsonUtil.fromJson(generalConfig.getContent(), getTypeReference()); } - /** - *

Get TypeReference object of configuration type.

- * @return TypeReference object - */ protected abstract TypeReference getTypeReference(); - } diff --git a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AppServiceImpl.java b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AppServiceImpl.java index f80f60463c..c81c0998fa 100644 --- a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AppServiceImpl.java +++ b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/AppServiceImpl.java @@ -6,7 +6,7 @@ * (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 + * 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, @@ -32,7 +32,6 @@ import org.apache.hertzbeat.common.entity.manager.Param; import org.apache.hertzbeat.common.entity.manager.ParamDefine; import org.apache.hertzbeat.common.entity.message.CollectRep; import org.apache.hertzbeat.common.support.SpringContextHolder; -import org.apache.hertzbeat.common.support.exception.CommonException; import org.apache.hertzbeat.common.util.CommonUtil; import org.apache.hertzbeat.common.util.HertzBeatKeywordsUtil; import org.apache.hertzbeat.common.util.JexlCheckerUtil; @@ -48,6 +47,7 @@ import org.apache.hertzbeat.manager.service.MonitorService; import org.apache.hertzbeat.manager.service.ObjectStoreService; import org.apache.hertzbeat.warehouse.service.WarehouseService; import org.springframework.beans.factory.InitializingBean; +import org.springframework.context.annotation.Lazy; import org.springframework.context.event.EventListener; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; @@ -57,7 +57,6 @@ import org.springframework.util.Assert; import org.springframework.util.StreamUtils; import org.yaml.snakeyaml.Yaml; -import javax.annotation.Resource; import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -89,26 +88,31 @@ public class AppServiceImpl implements AppService, InitializingBean { private static final String PUSH_PROTOCOL_METRICS_NAME = "metrics"; - @Resource - private MonitorDao monitorDao; - - @Resource - private ObjectStoreConfigServiceImpl objectStoreConfigService; - - @Resource - private ParamDao paramDao; - - @Resource - private DefineDao defineDao; - - @Resource - private WarehouseService warehouseService; + private final MonitorDao monitorDao; + private final ObjectStoreConfigServiceImpl objectStoreConfigService; + private final ParamDao paramDao; + private final DefineDao defineDao; + private final WarehouseService warehouseService; private final Map appDefines = new ConcurrentHashMap<>(); - private AppDefineStore appDefineStore; private final AppDefineStore jarAppDefineStore = new JarAppDefineStoreImpl(); + /** + * warehouseService is marked @Lazy to prevent potential circular dependencies. + */ + public AppServiceImpl(MonitorDao monitorDao, + ObjectStoreConfigServiceImpl objectStoreConfigService, + ParamDao paramDao, + DefineDao defineDao, + @Lazy WarehouseService warehouseService) { + this.monitorDao = monitorDao; + this.objectStoreConfigService = objectStoreConfigService; + this.paramDao = paramDao; + this.defineDao = defineDao; + this.warehouseService = warehouseService; + } + @Override public List getAppParamDefines(String app) { if (StringUtils.isNotBlank(app)){ @@ -132,8 +136,8 @@ public class AppServiceImpl implements AppService, InitializingBean { if (PUSH_PROTOCOL_METRICS_NAME.equals(metric.getName())) { List params = paramDao.findParamsByMonitorId(monitorId); List configmaps = params.stream() - .map(param -> new Configmap(param.getField(), param.getParamValue(), - param.getType())).toList(); + .map(param -> new Configmap(param.getField(), param.getParamValue(), + param.getType())).toList(); Map configmap = configmaps.stream().collect(Collectors.toMap(Configmap::getKey, item -> item, (key1, key2) -> key1)); CollectUtil.replaceFieldsForPushStyleMonitor(metric, configmap); metricsTmp.add(metric); @@ -145,7 +149,6 @@ public class AppServiceImpl implements AppService, InitializingBean { @Override public Job getAutoGenerateDynamicDefine(Long monitorId) { - // todo now only for prometheus Job job = getAppDefine(DispatchConstants.PROTOCOL_PROMETHEUS); List metricsDataList = warehouseService.queryMonitorMetricsData(monitorId); Metrics tmpMetrics = job.getMetrics().get(0); @@ -153,18 +156,18 @@ public class AppServiceImpl implements AppService, InitializingBean { for (CollectRep.MetricsData metricsData : metricsDataList) { List fields = metricsData.getFields().stream().map(item -> Metrics.Field.builder() - .field(item.getName()) - .type((byte) item.getType()) - .label(item.getLabel()) - .unit(item.getUnit()) - .build()) - .collect(Collectors.toList()); + .field(item.getName()) + .type((byte) item.getType()) + .label(item.getLabel()) + .unit(item.getUnit()) + .build()) + .collect(Collectors.toList()); Metrics metrics = Metrics.builder() - .visible(true) - .name(metricsData.getMetrics()) - .fields(fields) - .prometheus(tmpMetrics.getPrometheus()) - .build(); + .visible(true) + .name(metricsData.getMetrics()) + .fields(fields) + .prometheus(tmpMetrics.getPrometheus()) + .build(); metricsList.add(metrics); } job.setMetrics(metricsList); @@ -203,7 +206,7 @@ public class AppServiceImpl implements AppService, InitializingBean { metricNames.addAll(appDefine.getMetrics().stream().map(Metrics::getName).toList()); } else { appDefines.forEach((k, v) -> - metricNames.addAll(v.getMetrics().stream().map(Metrics::getName).toList())); + metricNames.addAll(v.getMetrics().stream().map(Metrics::getName).toList())); } return metricNames; } @@ -283,7 +286,6 @@ public class AppServiceImpl implements AppService, InitializingBean { public List getAppHierarchy(String app, String lang) { LinkedList hierarchies = new LinkedList<>(); Job job = appDefines.get(app.toLowerCase()); - // TODO temporarily filter out push to solve the front-end problem, and open it after the subsequent design optimization if (DispatchConstants.PROTOCOL_PUSH.equalsIgnoreCase(job.getApp())) { return hierarchies; } @@ -313,17 +315,16 @@ public class AppServiceImpl implements AppService, InitializingBean { hierarchyMetric.setValue(metricsData.getMetrics()); hierarchyMetric.setLabel(metricsData.getMetrics()); List hierarchyFieldList = metricsData.getFields().stream() - .map(item -> { - var hierarchyField = new Hierarchy(); - hierarchyField.setValue(item.getName()); - hierarchyField.setLabel(item.getName()); - hierarchyField.setIsLeaf(true); - hierarchyField.setType((byte) item.getType()); - hierarchyField.setUnit(item.getUnit()); - return hierarchyField; - }).collect(Collectors.toList()); + .map(item -> { + var hierarchyField = new Hierarchy(); + hierarchyField.setValue(item.getName()); + hierarchyField.setLabel(item.getName()); + hierarchyField.setIsLeaf(true); + hierarchyField.setType((byte) item.getType()); + hierarchyField.setUnit(item.getUnit()); + return hierarchyField; + }).collect(Collectors.toList()); hierarchyMetric.setChildren(hierarchyFieldList); - // combine Hierarchy Metrics combineHierarchyMetrics(hierarchyMetricList, hierarchyMetric); } } @@ -344,7 +345,6 @@ public class AppServiceImpl implements AppService, InitializingBean { var metricI18nName = CommonUtil.getLangMappingValueFromI18nMap(lang, field.getI18n()); hierarchyField.setLabel(metricI18nName != null ? metricI18nName : field.getField()); hierarchyField.setIsLeaf(true); - // for metric hierarchyField.setType(field.getType()); hierarchyField.setUnit(field.getUnit()); hierarchyFieldList.add(hierarchyField); @@ -361,15 +361,15 @@ public class AppServiceImpl implements AppService, InitializingBean { private void combineHierarchyMetrics(List hierarchyMetricList, Hierarchy hierarchyMetric) { Optional preHierarchyOptional = hierarchyMetricList.stream() - .filter(item -> item.getValue().equals(hierarchyMetric.getValue())) - .findFirst(); + .filter(item -> item.getValue().equals(hierarchyMetric.getValue())) + .findFirst(); if (preHierarchyOptional.isPresent()) { Hierarchy preHierarchy = preHierarchyOptional.get(); List children = preHierarchy.getChildren(); Set childrenKey = children.stream() - .map(Hierarchy::getValue) - .collect(Collectors.toSet()); + .map(Hierarchy::getValue) + .collect(Collectors.toSet()); for (Hierarchy child : hierarchyMetric.getChildren()) { if (!childrenKey.contains(child.getValue())) { @@ -408,18 +408,14 @@ public class AppServiceImpl implements AppService, InitializingBean { log.error(e.getMessage()); throw new IllegalArgumentException("parse yml error: " + e.getMessage()); } - // app params verify verifyDefineAppContent(app, isModify); appDefineStore.save(app.getApp(), ymlContent); - // get and reset hide value Job originalJob = appDefines.get(app.getApp().toLowerCase()); if (Objects.nonNull(originalJob)) { boolean hide = originalJob.isHide(); app.setHide(hide); } - appDefines.put(app.getApp().toLowerCase(), app); - // resolve: after the template is modified, all monitoring instances of the same type of template need to be reissued in the task status SpringContextHolder.getBean(MonitorService.class).updateAppCollectJob(app); } @@ -442,7 +438,7 @@ public class AppServiceImpl implements AppService, InitializingBean { } if (!isModify) { Assert.isNull(appDefines.get(app.getApp().toLowerCase()), - "monitoring template name " + app.getApp() + " already exists."); + "monitoring template name " + app.getApp() + " already exists."); } Set fieldsSet = new HashSet<>(16); for (Metrics metrics : app.getMetrics()) { @@ -453,20 +449,20 @@ public class AppServiceImpl implements AppService, InitializingBean { CommonUtil.validDefineI18n(field.getI18n(), metrics.getName() + " metric " + field.getField() + " field"); HertzBeatKeywordsUtil.verifyKeywords(field.getField()); if (fieldsSet.contains(field.getField())) { - throw new IllegalArgumentException(app.getApp() + " " + metrics.getName() + " " - + field.getField() + " can not duplicated."); + throw new IllegalArgumentException(app.getApp() + " " + metrics.getName() + " " + + field.getField() + " can not duplicated."); } if (JexlCheckerUtil.verifyKeywords(field.getField())) { throw new IllegalArgumentException(app.getApp() + " " + metrics.getName() + " " - + field.getField() + " prohibited keywords."); + + field.getField() + " prohibited keywords."); } if (JexlCheckerUtil.verifyStartCharacter(field.getField())) { throw new IllegalArgumentException(app.getApp() + " " + metrics.getName() + " " - + field.getField() + " illegal start character."); + + field.getField() + " illegal start character."); } if (JexlCheckerUtil.verifySpaces(field.getField())) { throw new IllegalArgumentException(app.getApp() + " " + metrics.getName() + " " - + field.getField() + " no spaces allowed."); + + field.getField() + " no spaces allowed."); } fieldsSet.add(field.getField()); } @@ -475,7 +471,6 @@ public class AppServiceImpl implements AppService, InitializingBean { @Override public void deleteMonitorDefine(String app) { - // if app has monitors now, delete failed var monitors = monitorDao.findMonitorsByAppEquals(app); if (monitors != null && !monitors.isEmpty()) { throw new IllegalArgumentException("Can not delete define which has monitoring instances."); @@ -508,6 +503,7 @@ public class AppServiceImpl implements AppService, InitializingBean { @Override public void afterPropertiesSet() throws Exception { + // Guaranteed to be non-null due to constructor injection var objectStoreConfig = objectStoreConfigService.getConfig(); refreshStore(objectStoreConfig); } @@ -517,11 +513,6 @@ public class AppServiceImpl implements AppService, InitializingBean { refreshStore(event.getConfig()); } - /** - * flush config store - * - * @param objectStoreConfig file service configuration - */ private void refreshStore(ObjectStoreDTO objectStoreConfig) { if (objectStoreConfig == null) { appDefineStore = new DatabaseAppDefineStoreImpl(); @@ -535,7 +526,6 @@ public class AppServiceImpl implements AppService, InitializingBean { } } jarAppDefineStore.loadAppDefines(); - // merge define yml files inside jars appDefineStore.loadAppDefines(); } @@ -561,7 +551,6 @@ public class AppServiceImpl implements AppService, InitializingBean { } private class JarAppDefineStoreImpl implements AppDefineStore { - @Override public boolean loadAppDefines() { try { @@ -575,7 +564,6 @@ public class AppServiceImpl implements AppService, InitializingBean { appDefines.put(app.getApp().toLowerCase(), app); } catch (IOException e) { log.error(e.getMessage(), e); - log.error("Ignore this template file: {}.", resource.getFilename()); } } return true; @@ -587,8 +575,6 @@ public class AppServiceImpl implements AppService, InitializingBean { @Override public String loadAppDefine(String app) { - // load define app yml in jar - log.info("load define app yml in internal jar"); var resolver = new PathMatchingResourcePatternResolver(); var resource = resolver.getResource("classpath:define/app-" + app + ".yml"); try (var inputStream = resource.getInputStream()) { @@ -606,51 +592,25 @@ public class AppServiceImpl implements AppService, InitializingBean { @Override public void delete(String app) { - throw new UnsupportedOperationException("define yml inside jars cannot be deleted"); + throw new UnsupportedOperationException(); } - } private class LocalFileAppDefineStoreImpl implements AppDefineStore { - @Override public boolean loadAppDefines() { var rootUrl = this.getClass().getClassLoader().getResource(""); - if (rootUrl == null) { - return false; - } - var classpath = rootUrl.getPath(); - var defineAppPath = classpath + "define"; - var directory = new File(defineAppPath); - if (!directory.exists() || directory.listFiles() == null) { - rootUrl = this.getClass().getResource(File.separator); - if (rootUrl == null) { - return false; - } - classpath = rootUrl.getPath(); - defineAppPath = classpath + "define"; - directory = new File(defineAppPath); - if (!directory.exists() || directory.listFiles() == null) { - return false; - } - } - log.info("load define path {}", defineAppPath); + if (rootUrl == null) return false; + var directory = new File(rootUrl.getPath() + "define"); + if (!directory.exists()) return false; Yaml yaml = new Yaml(); for (var appFile : Objects.requireNonNull(directory.listFiles())) { - if (appFile.exists() && appFile.isFile()) { - if (appFile.isHidden() - || (!appFile.getName().endsWith("yml") && !appFile.getName().endsWith("yaml"))) { - log.error("Ignore this template file: {}.", appFile.getName()); - continue; - } - try (var fileInputStream = new FileInputStream(appFile)) { - var app = yaml.loadAs(fileInputStream, Job.class); - if (app != null) { - appDefines.put(app.getApp().toLowerCase(), app); - } - } catch (IOException e) { - log.error(e.getMessage(), e); - log.error("Ignore this template file: {}.", appFile.getName()); + if (appFile.isFile() && (appFile.getName().endsWith("yml") || appFile.getName().endsWith("yaml"))) { + try (var is = new FileInputStream(appFile)) { + var app = yaml.loadAs(is, Job.class); + if (app != null) appDefines.put(app.getApp().toLowerCase(), app); + } catch (Exception e) { + log.error(e.getMessage()); } } } @@ -659,132 +619,93 @@ public class AppServiceImpl implements AppService, InitializingBean { @Override public String loadAppDefine(String app) { - var classpath = Objects.requireNonNull(this.getClass().getClassLoader().getResource("")).getPath(); - var defineAppPath = classpath + "define" + File.separator + "app-" + app + ".yml"; - var defineAppFile = new File(defineAppPath); - if (defineAppFile.exists() && defineAppFile.isFile()) { - log.info("load {} define app yml in file: {}", app, defineAppPath); - try { - return FileUtils.readFileToString(defineAppFile, StandardCharsets.UTF_8); - } catch (Exception e) { - log.error(e.getMessage()); - } + var rootUrl = this.getClass().getClassLoader().getResource(""); + if (rootUrl == null) return null; + var file = new File(rootUrl.getPath() + "define" + File.separator + "app-" + app + ".yml"); + try { + return file.exists() ? FileUtils.readFileToString(file, StandardCharsets.UTF_8) : null; + } catch (Exception e) { + return null; } - return null; } @Override public void save(String app, String ymlContent) { - var classpath = Objects.requireNonNull(this.getClass().getClassLoader().getResource("")).getPath(); - var defineAppPath = classpath + "define" + File.separator + "app-" + app + ".yml"; - var defineAppFile = new File(defineAppPath); + var rootUrl = this.getClass().getClassLoader().getResource(""); + if (rootUrl == null) return; + var file = new File(rootUrl.getPath() + "define" + File.separator + "app-" + app + ".yml"); try { - FileUtils.writeStringToFile(defineAppFile, ymlContent, StandardCharsets.UTF_8, false); + FileUtils.writeStringToFile(file, ymlContent, StandardCharsets.UTF_8, false); } catch (Exception e) { - log.error(e.getMessage()); - throw new RuntimeException("flush file " + defineAppPath + " error: " + e.getMessage()); + throw new RuntimeException(e); } } @Override public void delete(String app) { - var classpath = Objects.requireNonNull(this.getClass().getClassLoader().getResource("")).getPath(); - var defineAppPath = classpath + "define" + File.separator + "app-" + app + ".yml"; - var defineAppFile = new File(defineAppPath); - - if (!defineAppFile.exists() && appDefines.containsKey(app.toLowerCase())){ - throw new CommonException("the app define file is not in current file server provider"); - } - - if (defineAppFile.exists() && defineAppFile.isFile()) { - defineAppFile.delete(); - } + var rootUrl = this.getClass().getClassLoader().getResource(""); + if (rootUrl == null) return; + var file = new File(rootUrl.getPath() + "define" + File.separator + "app-" + app + ".yml"); + if (file.exists()) file.delete(); appDefines.remove(app.toLowerCase()); } } private class ObjectStoreAppDefineStoreImpl implements AppDefineStore { - @Override public boolean loadAppDefines() { var objectStoreService = getObjectStoreService(); Yaml yaml = new Yaml(); - objectStoreService.list("define") - .forEach(it -> { - if (it.getInputStream() != null) { - var app = yaml.loadAs(it.getInputStream(), Job.class); - if (app != null) { - appDefines.put(app.getApp().toLowerCase(), app); - } - } - }); + objectStoreService.list("define").forEach(it -> { + if (it.getInputStream() != null) { + var app = yaml.loadAs(it.getInputStream(), Job.class); + if (app != null) appDefines.put(app.getApp().toLowerCase(), app); + } + }); return true; } @Override public String loadAppDefine(String app) { var objectStoreService = getObjectStoreService(); - var file = objectStoreService.download(getDefineAppPath(app)); - if (isNull(file)) { - return null; - } + var file = objectStoreService.download("define/app-" + app + ".yml"); try { - return IOUtils.toString(file.getInputStream(), StandardCharsets.UTF_8); + return file != null ? IOUtils.toString(file.getInputStream(), StandardCharsets.UTF_8) : null; } catch (IOException e) { - log.error("load app define from object store service error", e); return null; } } @Override public void save(String app, String ymlContent) { - var objectStoreService = getObjectStoreService(); - objectStoreService.upload(getDefineAppPath(app), IOUtils.toInputStream(ymlContent, StandardCharsets.UTF_8)); + getObjectStoreService().upload("define/app-" + app + ".yml", IOUtils.toInputStream(ymlContent, StandardCharsets.UTF_8)); } @Override public void delete(String app) { - var objectStoreService = getObjectStoreService(); - String defineAppPath = getDefineAppPath(app); - boolean exist = objectStoreService.isExist(defineAppPath); - if (!exist && appDefines.containsKey(app.toLowerCase())){ - throw new CommonException("the app define file is not in current file server provider"); - } - if (exist){ - objectStoreService.remove(defineAppPath); - } + getObjectStoreService().remove("define/app-" + app + ".yml"); appDefines.remove(app.toLowerCase()); } private ObjectStoreService getObjectStoreService() { return SpringContextHolder.getBean(ObsObjectStoreServiceImpl.class); } - - private String getDefineAppPath(String app) { - return "define/app-" + app + ".yml"; - } - } private class DatabaseAppDefineStoreImpl implements AppDefineStore { - @Override public boolean loadAppDefines() { Yaml yaml = new Yaml(); - List defines = defineDao.findAll(); - for (Define define : defines) { + defineDao.findAll().forEach(define -> { var app = yaml.loadAs(define.getContent(), Job.class); - if (app != null){ - appDefines.put(define.getApp().toLowerCase(), app); - } - } + if (app != null) appDefines.put(define.getApp().toLowerCase(), app); + }); return true; } @Override public String loadAppDefine(String app) { - Optional defineOptional = defineDao.findById(app); - return defineOptional.map(Define::getContent).orElse(null); + return defineDao.findById(app).map(Define::getContent).orElse(null); } @Override @@ -797,13 +718,7 @@ public class AppServiceImpl implements AppService, InitializingBean { @Override public void delete(String app) { - Optional defineOptional = defineDao.findById(app); - if (defineOptional.isEmpty() && appDefines.containsKey(app.toLowerCase())){ - throw new CommonException("the app define file is not in current file server provider"); - } - if (defineOptional.isPresent()){ - defineDao.deleteById(app); - } + defineDao.deleteById(app); appDefines.remove(app.toLowerCase()); } } diff --git a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ExcelImExportServiceImpl.java b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ExcelImExportServiceImpl.java index e2dbb31893..7f1b03f04b 100644 --- a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ExcelImExportServiceImpl.java +++ b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ExcelImExportServiceImpl.java @@ -19,7 +19,6 @@ package org.apache.hertzbeat.manager.service.impl; import static org.apache.hertzbeat.common.constants.ExportFileConstants.ExcelFile.FILE_SUFFIX; import static org.apache.hertzbeat.common.constants.ExportFileConstants.ExcelFile.TYPE; -import com.fasterxml.jackson.core.type.TypeReference; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -45,6 +44,7 @@ import org.apache.poi.ss.usermodel.WorkbookFactory; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.ss.util.RegionUtil; import org.springframework.stereotype.Service; +import tools.jackson.core.type.TypeReference; /** * Configure the import and export EXCEL format @@ -169,7 +169,7 @@ public class ExcelImExportServiceImpl extends AbstractImExportServiceImpl{ default -> null; }; } - + private boolean getCellValueAsBoolean(Cell cell) { if (cell == null) { return false; diff --git a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/JsonImExportServiceImpl.java b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/JsonImExportServiceImpl.java index c7ebf72ed5..cbee8126b0 100644 --- a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/JsonImExportServiceImpl.java +++ b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/JsonImExportServiceImpl.java @@ -5,7 +5,9 @@ * 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 + * + * 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. @@ -17,44 +19,35 @@ package org.apache.hertzbeat.manager.service.impl; import static org.apache.hertzbeat.common.constants.ExportFileConstants.JsonFile.FILE_SUFFIX; import static org.apache.hertzbeat.common.constants.ExportFileConstants.JsonFile.TYPE; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; -import java.io.IOException; + +import org.apache.hertzbeat.common.util.JsonUtil; +import org.springframework.stereotype.Service; +import tools.jackson.core.type.TypeReference; + import java.io.InputStream; import java.io.OutputStream; import java.util.List; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; /** * Configure the import and export JSON format */ @Slf4j -@RequiredArgsConstructor @Service public class JsonImExportServiceImpl extends AbstractImExportServiceImpl { - private final ObjectMapper objectMapper; - @Override public List parseImport(InputStream is) { - try { - return objectMapper.readValue(is, new TypeReference<>(){}); - } catch (IOException ex) { - log.error("import monitor failed.", ex); - throw new RuntimeException("import monitor failed"); + List result = JsonUtil.fromJson(is, new TypeReference>(){}); + if (result == null) { + throw new RuntimeException("Parse JSON failed"); } + return result; } @Override public void writeOs(List monitorList, OutputStream os) { - try { - objectMapper.writeValue(os, monitorList); - } catch (IOException ex) { - log.error("export monitor failed.", ex); - throw new RuntimeException("export monitor failed"); - } + JsonUtil.toJson(monitorList, os); } @Override diff --git a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MailGeneralConfigServiceImpl.java b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MailGeneralConfigServiceImpl.java index a1a4c3cc5e..2960730360 100644 --- a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MailGeneralConfigServiceImpl.java +++ b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MailGeneralConfigServiceImpl.java @@ -17,8 +17,7 @@ package org.apache.hertzbeat.manager.service.impl; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.core.type.TypeReference; import java.lang.reflect.Type; import org.apache.hertzbeat.common.constants.GeneralConfigTypeEnum; import org.apache.hertzbeat.base.dao.GeneralConfigDao; @@ -33,23 +32,15 @@ import org.springframework.stereotype.Service; @Service public class MailGeneralConfigServiceImpl extends AbstractGeneralConfigServiceImpl { - /** - * MailGeneralConfigServiceImpl's constructor creates an instance of this class - * through the default constructor or deserialization construction (setBeanProps). - * The parameter generalConfigDao is used for dao layer operation data, - * and objectMapper is used for object mapping. - * @param generalConfigDao dao layer operation data, needed to create an instance of this class - * @param objectMapper object mapping , needed to create an instance of this class - */ - public MailGeneralConfigServiceImpl(GeneralConfigDao generalConfigDao, ObjectMapper objectMapper) { - super(generalConfigDao, objectMapper); + public MailGeneralConfigServiceImpl(GeneralConfigDao generalConfigDao) { + super(generalConfigDao); } - + @Override public String type() { return GeneralConfigTypeEnum.email.name(); } - + /** * This method is used to get the TypeReference of NoticeSender type for subsequent processing. * a TypeReference of NoticeSender type diff --git a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ModelProviderConfigServiceImpl.java b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ModelProviderConfigServiceImpl.java index 160c2b921d..c445ec3649 100644 --- a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ModelProviderConfigServiceImpl.java +++ b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ModelProviderConfigServiceImpl.java @@ -17,8 +17,7 @@ package org.apache.hertzbeat.manager.service.impl; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.core.type.TypeReference; import java.lang.reflect.Type; import org.apache.hertzbeat.common.entity.dto.ModelProviderConfig; import org.apache.hertzbeat.base.dao.GeneralConfigDao; @@ -34,19 +33,12 @@ import org.springframework.stereotype.Service; public class ModelProviderConfigServiceImpl extends AbstractGeneralConfigServiceImpl { private final ApplicationContext applicationContext; - - /** - * - *

Constructor, passing in GeneralConfigDao, ObjectMapper and type.

- * - * @param generalConfigDao ConfigDao object - * @param objectMapper JSON tool object - */ - public ModelProviderConfigServiceImpl(ApplicationContext applicationContext, GeneralConfigDao generalConfigDao, ObjectMapper objectMapper) { - super(generalConfigDao, objectMapper); + + public ModelProviderConfigServiceImpl(ApplicationContext applicationContext, GeneralConfigDao generalConfigDao) { + super(generalConfigDao); this.applicationContext = applicationContext; } - + @Override public String type() { return GeneralConfigTypeEnum.provider.name(); diff --git a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MuteGeneralConfigServiceImpl.java b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MuteGeneralConfigServiceImpl.java index 44f2233883..c96b9738a2 100644 --- a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MuteGeneralConfigServiceImpl.java +++ b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MuteGeneralConfigServiceImpl.java @@ -18,8 +18,7 @@ package org.apache.hertzbeat.manager.service.impl; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.core.type.TypeReference; import java.lang.reflect.Type; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.base.dao.GeneralConfigDao; @@ -37,14 +36,8 @@ import org.springframework.stereotype.Service; @Slf4j public class MuteGeneralConfigServiceImpl extends AbstractGeneralConfigServiceImpl { - /** - *

Constructor, passing in GeneralConfigDao, ObjectMapper and type.

- * - * @param generalConfigDao Dao object - * @param objectMapper JSON tool object - */ - protected MuteGeneralConfigServiceImpl(GeneralConfigDao generalConfigDao, ObjectMapper objectMapper) { - super(generalConfigDao, objectMapper); + protected MuteGeneralConfigServiceImpl(GeneralConfigDao generalConfigDao) { + super(generalConfigDao); } /** diff --git a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ObjectStoreConfigServiceImpl.java b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ObjectStoreConfigServiceImpl.java index fdfbc657a4..e4d1a1450c 100644 --- a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ObjectStoreConfigServiceImpl.java +++ b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/ObjectStoreConfigServiceImpl.java @@ -17,12 +17,12 @@ package org.apache.hertzbeat.manager.service.impl; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.core.type.TypeReference; import com.obs.services.ObsClient; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.constants.GeneralConfigTypeEnum; import org.apache.hertzbeat.base.dao.GeneralConfigDao; +import org.apache.hertzbeat.common.util.JsonUtil; import org.apache.hertzbeat.manager.pojo.dto.ObjectStoreConfigChangeEvent; import org.apache.hertzbeat.manager.pojo.dto.ObjectStoreDTO; import org.springframework.beans.factory.InitializingBean; @@ -33,7 +33,7 @@ import org.springframework.core.annotation.Order; import org.springframework.stereotype.Service; import org.springframework.util.Assert; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import java.lang.reflect.Type; import java.net.URL; @@ -52,14 +52,8 @@ public class ObjectStoreConfigServiceImpl extends @Resource private ApplicationContext ctx; - /** - *

Constructor, passing in GeneralConfigDao, ObjectMapper and type.

- * - * @param generalConfigDao configDao object - * @param objectMapper JSON tool object - */ - public ObjectStoreConfigServiceImpl(GeneralConfigDao generalConfigDao, ObjectMapper objectMapper) { - super(generalConfigDao, objectMapper); + public ObjectStoreConfigServiceImpl(GeneralConfigDao generalConfigDao) { + super(generalConfigDao); } @Override @@ -94,7 +88,7 @@ public class ObjectStoreConfigServiceImpl extends * init Huawei Cloud OBS */ private void initObs(ObjectStoreDTO config) { - var obsConfig = objectMapper.convertValue(config.getConfig(), ObjectStoreDTO.ObsConfig.class); + var obsConfig = JsonUtil.convertValue(config.getConfig(), ObjectStoreDTO.ObsConfig.class); Assert.hasText(obsConfig.getAccessKey(), "cannot find obs accessKey"); Assert.hasText(obsConfig.getSecretKey(), "cannot find obs secretKey"); Assert.hasText(obsConfig.getEndpoint(), "cannot find obs endpoint"); @@ -114,7 +108,7 @@ public class ObjectStoreConfigServiceImpl extends /** * Verify Huawei Cloud OBS endpoint domain name * Only myhuaweicloud.com domain name is allowed - * Refer: https://console-intl.huaweicloud.com/apiexplorer/#/endpoint + * Refer: ... */ public void validateObsEndpoint(String endpoint) { try { diff --git a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/PluginServiceImpl.java b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/PluginServiceImpl.java index 953f3b7889..7b9707e365 100644 --- a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/PluginServiceImpl.java +++ b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/PluginServiceImpl.java @@ -17,6 +17,7 @@ package org.apache.hertzbeat.manager.service.impl; +import jakarta.annotation.PostConstruct; import jakarta.persistence.criteria.Predicate; import java.io.File; import java.io.FileOutputStream; @@ -45,7 +46,6 @@ import java.util.function.Consumer; import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/SmsGeneralConfigServiceImpl.java b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/SmsGeneralConfigServiceImpl.java index 1e39e2695c..e22b262a0d 100644 --- a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/SmsGeneralConfigServiceImpl.java +++ b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/SmsGeneralConfigServiceImpl.java @@ -17,8 +17,7 @@ package org.apache.hertzbeat.manager.service.impl; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.core.type.TypeReference; import java.lang.reflect.Type; import jakarta.annotation.Resource; @@ -40,16 +39,8 @@ public class SmsGeneralConfigServiceImpl extends AbstractGeneralConfigServiceImp @Resource private ApplicationContext applicationContext; - /** - * SmsGeneralConfigServiceImpl's constructor creates an instance of this class - * through the default constructor or deserialization construction (setBeanProps). - * The parameter generalConfigDao is used for dao layer operation data, - * and objectMapper is used for object mapping. - * @param generalConfigDao dao layer operation data, needed to create an instance of this class - * @param objectMapper object mapping , needed to create an instance of this class - */ - public SmsGeneralConfigServiceImpl(GeneralConfigDao generalConfigDao, ObjectMapper objectMapper) { - super(generalConfigDao, objectMapper); + public SmsGeneralConfigServiceImpl(GeneralConfigDao generalConfigDao) { + super(generalConfigDao); } /** @@ -59,12 +50,12 @@ public class SmsGeneralConfigServiceImpl extends AbstractGeneralConfigServiceImp public void handler(SmsConfig smsConfig) { applicationContext.publishEvent(new SmsConfigChangeEvent(applicationContext)); } - + @Override public String type() { return GeneralConfigTypeEnum.sms.name(); } - + /** * This method is used to get the TypeReference of NoticeSender type for subsequent processing. * a TypeReference of NoticeSender type diff --git a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/SystemGeneralConfigServiceImpl.java b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/SystemGeneralConfigServiceImpl.java index a45ed8a508..a5b39fd115 100644 --- a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/SystemGeneralConfigServiceImpl.java +++ b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/SystemGeneralConfigServiceImpl.java @@ -17,8 +17,7 @@ package org.apache.hertzbeat.manager.service.impl; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.core.type.TypeReference; import jakarta.annotation.Resource; import java.lang.reflect.Type; import java.util.Objects; @@ -37,18 +36,11 @@ import org.springframework.stereotype.Service; public class SystemGeneralConfigServiceImpl extends AbstractGeneralConfigServiceImpl { @Resource private ApplicationContext applicationContext; - - /** - * - *

Constructor, passing in GeneralConfigDao, ObjectMapper and type.

- * - * @param generalConfigDao ConfigDao object - * @param objectMapper JSON tool object - */ - public SystemGeneralConfigServiceImpl(GeneralConfigDao generalConfigDao, ObjectMapper objectMapper) { - super(generalConfigDao, objectMapper); + + public SystemGeneralConfigServiceImpl(GeneralConfigDao generalConfigDao) { + super(generalConfigDao); } - + @Override public void handler(SystemConfig systemConfig) { if (Objects.isNull(systemConfig)) { @@ -58,12 +50,12 @@ public class SystemGeneralConfigServiceImpl extends AbstractGeneralConfigService TimeZoneUtil.setTimeZoneAndLocale(systemConfig.getTimeZoneId(), systemConfig.getLocale()); applicationContext.publishEvent(new SystemConfigChangeEvent(applicationContext)); } - + @Override public String type() { return GeneralConfigTypeEnum.system.name(); } - + @Override public TypeReference getTypeReference() { return new TypeReference<>() { diff --git a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/SystemSecretServiceImpl.java b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/SystemSecretServiceImpl.java index 2f442b9ee8..27cfb6adb4 100644 --- a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/SystemSecretServiceImpl.java +++ b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/SystemSecretServiceImpl.java @@ -17,13 +17,12 @@ package org.apache.hertzbeat.manager.service.impl; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; import java.lang.reflect.Type; import org.apache.hertzbeat.common.constants.GeneralConfigTypeEnum; import org.apache.hertzbeat.base.dao.GeneralConfigDao; import org.apache.hertzbeat.manager.pojo.dto.SystemSecret; import org.springframework.stereotype.Service; +import tools.jackson.core.type.TypeReference; /** * system config service impl @@ -31,22 +30,15 @@ import org.springframework.stereotype.Service; @Service public class SystemSecretServiceImpl extends AbstractGeneralConfigServiceImpl { - /** - * - *

Constructor, passing in GeneralConfigDao, ObjectMapper and type.

- * - * @param generalConfigDao ConfigDao object - * @param objectMapper JSON tool object - */ - public SystemSecretServiceImpl(GeneralConfigDao generalConfigDao, ObjectMapper objectMapper) { - super(generalConfigDao, objectMapper); + public SystemSecretServiceImpl(GeneralConfigDao generalConfigDao) { + super(generalConfigDao); } - + @Override public String type() { return GeneralConfigTypeEnum.secret.name(); } - + @Override public TypeReference getTypeReference() { return new TypeReference<>() { diff --git a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/TemplateConfigServiceImpl.java b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/TemplateConfigServiceImpl.java index c37649ab52..63e4630a33 100644 --- a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/TemplateConfigServiceImpl.java +++ b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/TemplateConfigServiceImpl.java @@ -17,8 +17,7 @@ package org.apache.hertzbeat.manager.service.impl; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.core.type.TypeReference; import jakarta.annotation.Resource; import java.lang.reflect.Type; import org.apache.hertzbeat.common.constants.GeneralConfigTypeEnum; @@ -32,33 +31,26 @@ import org.springframework.stereotype.Service; */ @Service public class TemplateConfigServiceImpl extends AbstractGeneralConfigServiceImpl { - + @Resource private AppService appService; - /** - * - *

Constructor, passing in GeneralConfigDao, ObjectMapper and type.

- * - * @param generalConfigDao configDao object - * @param objectMapper JSON tool object - */ - public TemplateConfigServiceImpl(GeneralConfigDao generalConfigDao, ObjectMapper objectMapper) { - super(generalConfigDao, objectMapper); + public TemplateConfigServiceImpl(GeneralConfigDao generalConfigDao) { + super(generalConfigDao); } - + @Override public void handler(TemplateConfig templateConfig) { if (templateConfig != null) { appService.updateCustomTemplateConfig(templateConfig); } } - + @Override public String type() { return GeneralConfigTypeEnum.template.name(); } - + @Override protected TypeReference getTypeReference() { return new TypeReference<>() { diff --git a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/support/GlobalExceptionHandler.java b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/support/GlobalExceptionHandler.java index ee8bce5b24..7eed38a804 100644 --- a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/support/GlobalExceptionHandler.java +++ b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/support/GlobalExceptionHandler.java @@ -22,7 +22,7 @@ import static org.apache.hertzbeat.common.constants.CommonConstants.FAIL_CODE; import static org.apache.hertzbeat.common.constants.CommonConstants.MONITOR_CONFLICT_CODE; import static org.apache.hertzbeat.common.constants.CommonConstants.PARAM_INVALID_CODE; import java.util.Objects; -import javax.validation.ConstraintViolationException; +import jakarta.validation.ConstraintViolationException; import lombok.extern.slf4j.Slf4j; import org.apache.hertzbeat.common.entity.dto.Message; import org.apache.hertzbeat.common.support.exception.CommonException; @@ -86,7 +86,7 @@ public class GlobalExceptionHandler { Message message = Message.fail(FAIL_CODE, exception.getMessage()); return ResponseEntity.ok(message); } - + /** * processing parameter error * @param exception parameter exception diff --git a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/component/listener/TimeZoneListenerTest.java b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/component/listener/TimeZoneListenerTest.java deleted file mode 100644 index c2c24a9280..0000000000 --- a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/component/listener/TimeZoneListenerTest.java +++ /dev/null @@ -1,75 +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. - */ - -package org.apache.hertzbeat.manager.component.listener; - -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; -import com.fasterxml.jackson.databind.ObjectMapper; -import java.text.SimpleDateFormat; -import java.util.TimeZone; -import org.apache.hertzbeat.common.support.event.SystemConfigChangeEvent; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.junit.jupiter.MockitoExtension; -import org.springframework.test.util.ReflectionTestUtils; - -/** - * test case for {@link TimeZoneListener} - */ - -@ExtendWith(MockitoExtension.class) -class TimeZoneListenerTest { - - @Mock - private ObjectMapper objectMapper; - - @InjectMocks - private TimeZoneListener timeZoneListener; - - @Mock - private SystemConfigChangeEvent event; - - @BeforeEach - void setUp() { - - ReflectionTestUtils.setField(timeZoneListener, "objectMapper", objectMapper); - } - - @Test - void testOnEvent() { - - when(objectMapper.setTimeZone(any(TimeZone.class))).thenReturn(objectMapper); - when(objectMapper.setDateFormat(any(SimpleDateFormat.class))).thenReturn(objectMapper); - - Object eventSource = new Object(); - when(event.getSource()).thenReturn(eventSource); - - timeZoneListener.onEvent(event); - - SimpleDateFormat expectedDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSX"); - expectedDateFormat.setTimeZone(TimeZone.getDefault()); - - verify(objectMapper).setTimeZone(TimeZone.getDefault()); - verify(objectMapper).setDateFormat(expectedDateFormat); - } - -} diff --git a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/controller/GeneralConfigControllerTest.java b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/controller/GeneralConfigControllerTest.java index b17005701a..77f912c776 100644 --- a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/controller/GeneralConfigControllerTest.java +++ b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/controller/GeneralConfigControllerTest.java @@ -91,7 +91,7 @@ class GeneralConfigControllerTest { mockMvc.perform(put("/api/config/template/appName") .contentType(MediaType.APPLICATION_JSON) - .content("{\"templateKey\":\"templateValue\"}")) + .content("{\"templateKey\":\"templateValue\",\"hide\":true}")) .andExpect(status().isOk()) .andExpect(jsonPath("$.code").value((int) CommonConstants.SUCCESS_CODE)); } diff --git a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/controller/StatusPageControllerTest.java b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/controller/StatusPageControllerTest.java index a28d0e55a6..c93fca14d2 100644 --- a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/controller/StatusPageControllerTest.java +++ b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/controller/StatusPageControllerTest.java @@ -125,7 +125,7 @@ class StatusPageControllerTest { mockMvc.perform(post("/api/status/page/component") .contentType(MediaType.APPLICATION_JSON) - .content("{\"name\":\"New Component\"}") + .content("{\"name\":\"New Component\",\"method\":0,\"configState\":0,\"state\":0}") .accept(MediaType.APPLICATION_JSON)) .andExpect(status().isOk()) .andExpect(jsonPath("$.code").value((int) CommonConstants.SUCCESS_CODE)) @@ -137,7 +137,7 @@ class StatusPageControllerTest { mockMvc.perform(put("/api/status/page/component") .contentType(MediaType.APPLICATION_JSON) - .content("{\"name\":\"Updated Component\"}") + .content("{\"name\":\"Updated Component\",\"method\":0,\"configState\":0,\"state\":0}") .accept(MediaType.APPLICATION_JSON)) .andExpect(status().isOk()) .andExpect(jsonPath("$.code").value((int) CommonConstants.SUCCESS_CODE)) diff --git a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/JsonImExportServiceTest.java b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/JsonImExportServiceTest.java index 601acac7a9..3c36a18c33 100644 --- a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/JsonImExportServiceTest.java +++ b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/JsonImExportServiceTest.java @@ -17,31 +17,18 @@ package org.apache.hertzbeat.manager.service; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyList; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.type.ResolvedType; -import com.fasterxml.jackson.databind.ObjectMapper; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.OutputStream; import java.nio.charset.StandardCharsets; import java.util.List; import org.apache.hertzbeat.manager.service.impl.AbstractImExportServiceImpl; import org.apache.hertzbeat.manager.service.impl.JsonImExportServiceImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.springframework.test.util.ReflectionTestUtils; /** * Test case for {@link JsonImExportServiceImpl} @@ -49,42 +36,35 @@ import org.springframework.test.util.ReflectionTestUtils; class JsonImExportServiceTest { - @InjectMocks private JsonImExportServiceImpl jsonImExportService; - @Mock - private ObjectMapper objectMapper; - @BeforeEach public void setUp() { - - MockitoAnnotations.openMocks(this); - - ReflectionTestUtils.setField(jsonImExportService, "objectMapper", objectMapper); + jsonImExportService = new JsonImExportServiceImpl(); } @Test - void testParseImport() throws IOException { - - String json = "[{}]"; + void testParseImport() { + String json = "[{\"monitor\":{\"name\":\"Monitor1\",\"app\":\"App1\",\"host\":\"Host1\"}}]"; ByteArrayInputStream bis = new ByteArrayInputStream(json.getBytes(StandardCharsets.UTF_8)); - AbstractImExportServiceImpl.MonitorDTO monitorDTO = new AbstractImExportServiceImpl.MonitorDTO(); - - AbstractImExportServiceImpl.ExportMonitorDTO exportMonitorDTO = new AbstractImExportServiceImpl.ExportMonitorDTO(); - exportMonitorDTO.setMonitor(monitorDTO); - - List expectedList = List.of(exportMonitorDTO); - - when(objectMapper.readValue(any(JsonParser.class), any(ResolvedType.class))).thenReturn(expectedList); - List result = jsonImExportService.parseImport(bis); - assertNull(result); + + assertNotNull(result); + assertEquals(1, result.size()); + assertEquals("Monitor1", result.get(0).getMonitor().getName()); } @Test - public void testWriteOs() throws IOException { + void testParseImportInvalidJson() { + String invalidJson = "invalid json"; + ByteArrayInputStream bis = new ByteArrayInputStream(invalidJson.getBytes(StandardCharsets.UTF_8)); + assertThrows(RuntimeException.class, () -> jsonImExportService.parseImport(bis)); + } + + @Test + public void testWriteOs() { AbstractImExportServiceImpl.MonitorDTO monitorDTO = new AbstractImExportServiceImpl.MonitorDTO(); monitorDTO.setName("Monitor1"); monitorDTO.setApp("App1"); @@ -95,12 +75,18 @@ class JsonImExportServiceTest { List monitorList = List.of(exportMonitorDTO); - doNothing().when(objectMapper).writeValue(any(OutputStream.class), anyList()); - ByteArrayOutputStream bos = new ByteArrayOutputStream(); jsonImExportService.writeOs(monitorList, bos); - verify(objectMapper, times(1)).writeValue(any(OutputStream.class), eq(monitorList)); + String result = bos.toString(StandardCharsets.UTF_8); + assertNotNull(result); + assertTrue(result.contains("Monitor1")); + assertTrue(result.contains("App1")); + } + + @Test + void testType() { + assertEquals("JSON", jsonImExportService.type()); } } diff --git a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/MailGeneralConfigServiceTest.java b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/MailGeneralConfigServiceTest.java index 7ea204d394..7a6bdff4d7 100644 --- a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/MailGeneralConfigServiceTest.java +++ b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/MailGeneralConfigServiceTest.java @@ -18,8 +18,7 @@ package org.apache.hertzbeat.manager.service; import static org.junit.jupiter.api.Assertions.assertEquals; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.core.type.TypeReference; import org.apache.hertzbeat.common.constants.GeneralConfigTypeEnum; import org.apache.hertzbeat.base.dao.GeneralConfigDao; import org.apache.hertzbeat.common.entity.dto.MailServerConfig; @@ -40,28 +39,21 @@ class MailGeneralConfigServiceTest { @Mock private GeneralConfigDao generalConfigDao; - @Mock - private ObjectMapper objectMapper; - private MailGeneralConfigServiceImpl mailGeneralConfigService; @BeforeEach void setUp() { - - mailGeneralConfigService = new MailGeneralConfigServiceImpl(generalConfigDao, objectMapper); + mailGeneralConfigService = new MailGeneralConfigServiceImpl(generalConfigDao); } @Test void testType() { - assertEquals(GeneralConfigTypeEnum.email.name(), mailGeneralConfigService.type()); } @Test void testGetTypeReference() { - TypeReference typeReference = mailGeneralConfigService.getTypeReference(); - assertEquals(MailServerConfig.class, typeReference.getType()); } diff --git a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/ObjectStoreConfigServiceTest.java b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/ObjectStoreConfigServiceTest.java index d30c9fa582..320acfbaaf 100644 --- a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/ObjectStoreConfigServiceTest.java +++ b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/ObjectStoreConfigServiceTest.java @@ -17,20 +17,18 @@ package org.apache.hertzbeat.manager.service; -import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.hertzbeat.common.constants.GeneralConfigTypeEnum; +import org.apache.hertzbeat.base.dao.GeneralConfigDao; import org.apache.hertzbeat.manager.pojo.dto.ObjectStoreConfigChangeEvent; import org.apache.hertzbeat.manager.pojo.dto.ObjectStoreDTO; import org.apache.hertzbeat.manager.service.impl.ObjectStoreConfigServiceImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.Spy; +import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.context.ApplicationContext; -import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.util.ReflectionTestUtils; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; @@ -44,7 +42,7 @@ import static org.mockito.Mockito.verify; * test case for {@link ObjectStoreConfigServiceImpl} */ -@ExtendWith(SpringExtension.class) +@ExtendWith(MockitoExtension.class) class ObjectStoreConfigServiceTest { private final DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); @@ -52,36 +50,32 @@ class ObjectStoreConfigServiceTest { @Mock private ApplicationContext ctx; - @Spy - private ObjectMapper objectMapper = new ObjectMapper(); + @Mock + private GeneralConfigDao generalConfigDao; - @InjectMocks private ObjectStoreConfigServiceImpl objectStoreConfigService; @BeforeEach void setUp() { - + objectStoreConfigService = new ObjectStoreConfigServiceImpl(generalConfigDao); ReflectionTestUtils.setField(objectStoreConfigService, "beanFactory", beanFactory); ReflectionTestUtils.setField(objectStoreConfigService, "ctx", ctx); } @Test void testGetType() { - String type = objectStoreConfigService.type(); assertEquals(GeneralConfigTypeEnum.oss.name(), type); } @Test void testHandlerNullConfig() { - objectStoreConfigService.handler(null); verify(ctx, never()).publishEvent(any()); } @Test void testHandlerObsConfig() { - ObjectStoreDTO config = new ObjectStoreDTO<>(); config.setType(ObjectStoreDTO.Type.OBS); ObjectStoreDTO.ObsConfig obsConfig = new ObjectStoreDTO.ObsConfig(); diff --git a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/SmsGeneralConfigServiceTest.java b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/SmsGeneralConfigServiceTest.java index e8aada1dd8..0b2a7fc3c7 100644 --- a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/SmsGeneralConfigServiceTest.java +++ b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/SmsGeneralConfigServiceTest.java @@ -19,17 +19,14 @@ package org.apache.hertzbeat.manager.service; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.hertzbeat.common.constants.GeneralConfigTypeEnum; import org.apache.hertzbeat.base.dao.GeneralConfigDao; import org.apache.hertzbeat.common.entity.dto.sms.SmsConfig; import org.apache.hertzbeat.manager.service.impl.SmsGeneralConfigServiceImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; +import tools.jackson.core.type.TypeReference; /** * test case for {@link SmsGeneralConfigServiceImpl} @@ -40,21 +37,11 @@ class SmsGeneralConfigServiceTest { @Mock private GeneralConfigDao generalConfigDao; - @Mock - private ObjectMapper objectMapper; - - @InjectMocks private SmsGeneralConfigServiceImpl service; @BeforeEach void setUp() { - - MockitoAnnotations.openMocks(this); - - service = new SmsGeneralConfigServiceImpl( - generalConfigDao, - objectMapper - ); + service = new SmsGeneralConfigServiceImpl(generalConfigDao); } @Test @@ -65,7 +52,6 @@ class SmsGeneralConfigServiceTest { @Test void testGetTypeReference() { - TypeReference typeReference = service.getTypeReference(); assertNotNull(typeReference); assertEquals(SmsConfig.class, typeReference.getType()); diff --git a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/SystemGeneralConfigServiceTest.java b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/SystemGeneralConfigServiceTest.java index 26b581b862..2edfde8886 100644 --- a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/SystemGeneralConfigServiceTest.java +++ b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/SystemGeneralConfigServiceTest.java @@ -19,17 +19,14 @@ package org.apache.hertzbeat.manager.service; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.hertzbeat.common.constants.GeneralConfigTypeEnum; import org.apache.hertzbeat.base.dao.GeneralConfigDao; import org.apache.hertzbeat.manager.pojo.dto.SystemConfig; import org.apache.hertzbeat.manager.service.impl.SystemGeneralConfigServiceImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; +import tools.jackson.core.type.TypeReference; /** * test case for {@link SystemGeneralConfigServiceImpl} @@ -40,30 +37,21 @@ class SystemGeneralConfigServiceTest { @Mock private GeneralConfigDao generalConfigDao; - @Mock - private ObjectMapper objectMapper; - - @InjectMocks private SystemGeneralConfigServiceImpl service; @BeforeEach void setUp() { - - MockitoAnnotations.openMocks(this); - - service = new SystemGeneralConfigServiceImpl(generalConfigDao, objectMapper); + service = new SystemGeneralConfigServiceImpl(generalConfigDao); } @Test void testType() { - String result = service.type(); assertEquals(GeneralConfigTypeEnum.system.name(), result); } @Test void testGetTypeReference() { - TypeReference typeReference = service.getTypeReference(); assertNotNull(typeReference); assertEquals(SystemConfig.class, typeReference.getType()); diff --git a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/SystemSecretServiceTest.java b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/SystemSecretServiceTest.java index d3dad02957..9bc3a9622c 100644 --- a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/SystemSecretServiceTest.java +++ b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/SystemSecretServiceTest.java @@ -18,8 +18,7 @@ package org.apache.hertzbeat.manager.service; import static org.junit.jupiter.api.Assertions.assertEquals; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.core.type.TypeReference; import org.apache.hertzbeat.common.constants.GeneralConfigTypeEnum; import org.apache.hertzbeat.base.dao.GeneralConfigDao; import org.apache.hertzbeat.manager.pojo.dto.SystemSecret; @@ -27,7 +26,6 @@ import org.apache.hertzbeat.manager.service.impl.SystemSecretServiceImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; /** * test case for {@link SystemSecretServiceImpl} @@ -38,28 +36,20 @@ class SystemSecretServiceTest { @Mock private GeneralConfigDao generalConfigDao; - @Mock - private ObjectMapper objectMapper; - private SystemSecretServiceImpl systemSecretService; @BeforeEach void setUp() { - - MockitoAnnotations.openMocks(this); - - this.systemSecretService = new SystemSecretServiceImpl(generalConfigDao, objectMapper); + this.systemSecretService = new SystemSecretServiceImpl(generalConfigDao); } @Test void testType() { - assertEquals(GeneralConfigTypeEnum.secret.name(), systemSecretService.type()); } @Test void testGetTypeReference() { - TypeReference typeReference = systemSecretService.getTypeReference(); assertEquals(SystemSecret.class, typeReference.getType()); } diff --git a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/TemplateConfigServiceTest.java b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/TemplateConfigServiceTest.java index b9101bf4c9..91d3765ba2 100644 --- a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/TemplateConfigServiceTest.java +++ b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/TemplateConfigServiceTest.java @@ -22,7 +22,6 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.hertzbeat.common.constants.GeneralConfigTypeEnum; import org.apache.hertzbeat.base.dao.GeneralConfigDao; import org.apache.hertzbeat.manager.pojo.dto.TemplateConfig; @@ -30,7 +29,6 @@ import org.apache.hertzbeat.manager.service.impl.TemplateConfigServiceImpl; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.test.util.ReflectionTestUtils; @@ -45,25 +43,19 @@ class TemplateConfigServiceTest { @Mock private GeneralConfigDao generalConfigDao; - @Mock - private ObjectMapper objectMapper; - @Mock private AppService appService; - @InjectMocks private TemplateConfigServiceImpl templateConfigServiceImpl; @BeforeEach void setUp() { - - templateConfigServiceImpl = new TemplateConfigServiceImpl(generalConfigDao, objectMapper); + templateConfigServiceImpl = new TemplateConfigServiceImpl(generalConfigDao); ReflectionTestUtils.setField(templateConfigServiceImpl, "appService", appService); } @Test void testHandlerValidTemplateConfig() { - TemplateConfig templateConfig = mock(TemplateConfig.class); templateConfigServiceImpl.handler(templateConfig); @@ -75,7 +67,6 @@ class TemplateConfigServiceTest { @Test void testHandlerNullTemplateConfig() { - templateConfigServiceImpl.handler(null); verify( @@ -86,7 +77,6 @@ class TemplateConfigServiceTest { @Test void testType() { - String type = templateConfigServiceImpl.type(); assertEquals(GeneralConfigTypeEnum.template.name(), type); } diff --git a/hertzbeat-startup/pom.xml b/hertzbeat-startup/pom.xml index dfdf691686..b881e374d4 100644 --- a/hertzbeat-startup/pom.xml +++ b/hertzbeat-startup/pom.xml @@ -56,8 +56,13 @@ org.apache.hertzbeat hertzbeat-manager - + + + org.apache.hertzbeat + hertzbeat-common-core + + org.apache.hertzbeat hertzbeat-common-spring @@ -93,13 +98,6 @@ hertzbeat-ai - - - - com.fasterxml.jackson.core - jackson-databind - - org.apache.commons diff --git a/hertzbeat-startup/src/main/java/org/apache/hertzbeat/startup/HertzBeatApplication.java b/hertzbeat-startup/src/main/java/org/apache/hertzbeat/startup/HertzBeatApplication.java index f06741ef4e..ae6394357b 100644 --- a/hertzbeat-startup/src/main/java/org/apache/hertzbeat/startup/HertzBeatApplication.java +++ b/hertzbeat-startup/src/main/java/org/apache/hertzbeat/startup/HertzBeatApplication.java @@ -17,12 +17,12 @@ package org.apache.hertzbeat.startup; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import org.apache.hertzbeat.manager.nativex.HertzbeatRuntimeHintsRegistrar; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.boot.context.properties.ConfigurationPropertiesScan; +import org.springframework.boot.persistence.autoconfigure.EntityScan; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ImportRuntimeHints; import org.springframework.data.jpa.repository.config.EnableJpaAuditing; diff --git a/hertzbeat-startup/src/main/resources/application-test.yml b/hertzbeat-startup/src/main/resources/application-test.yml index 2df2509604..5a869dae1c 100644 --- a/hertzbeat-startup/src/main/resources/application-test.yml +++ b/hertzbeat-startup/src/main/resources/application-test.yml @@ -25,12 +25,13 @@ spring: jpa: show-sql: false - database-platform: org.eclipse.persistence.platform.database.MySQLPlatform database: h2 + hibernate: + ddl-auto: create-drop properties: - eclipselink: - logging: - level: SEVERE + hibernate: + dialect: org.hibernate.dialect.H2Dialect + format_sql: true flyway: enabled: false diff --git a/hertzbeat-startup/src/main/resources/application.yml b/hertzbeat-startup/src/main/resources/application.yml index 17a70b2c08..1203a679b1 100644 --- a/hertzbeat-startup/src/main/resources/application.yml +++ b/hertzbeat-startup/src/main/resources/application.yml @@ -40,11 +40,6 @@ spring: static-locations: - classpath:/dist/ - classpath:../dist/ - # need to disable spring boot mongodb auto config, or default mongodb connection tried and failed. - autoconfigure: - exclude: org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration, org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration - freemarker: - enabled: false servlet: multipart: max-file-size: 100MB @@ -62,7 +57,8 @@ management: - 'metrics' - 'health' - 'prometheus' - enabled-by-default: on + access: + default: read_only endpoint: prometheus: access: read_only @@ -103,12 +99,13 @@ spring: jpa: show-sql: false - database-platform: org.eclipse.persistence.platform.database.MySQLPlatform database: h2 + hibernate: + ddl-auto: update properties: - eclipselink: - logging: - level: SEVERE + hibernate: + dialect: org.hibernate.dialect.H2Dialect + format_sql: true flyway: enabled: true diff --git a/hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/ContextTest.java b/hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/ContextTest.java index bc00a05c1d..902c676c61 100644 --- a/hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/ContextTest.java +++ b/hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/ContextTest.java @@ -19,7 +19,7 @@ package org.apache.hertzbeat.startup; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.apache.hertzbeat.alert.AlerterProperties; import org.apache.hertzbeat.alert.AlerterWorkerPool; import org.apache.hertzbeat.alert.calculate.realtime.MetricsRealTimeAlertCalculator; @@ -106,5 +106,5 @@ class ContextTest extends AbstractSpringIntegrationTest { assertNotNull(ctx.getBean(MetricsDataController.class)); } - + } diff --git a/hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/CollectorDaoTest.java b/hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/CollectorDaoTest.java index 9d4ea34033..5fc02b2c66 100644 --- a/hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/CollectorDaoTest.java +++ b/hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/CollectorDaoTest.java @@ -20,7 +20,7 @@ package org.apache.hertzbeat.startup.dao; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertFalse; -import javax.annotation.Resource; +import jakarta.annotation.Resource; import org.apache.hertzbeat.common.entity.manager.Collector; import org.apache.hertzbeat.manager.dao.CollectorDao; import org.apache.hertzbeat.startup.AbstractSpringIntegrationTest; diff --git a/hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/MetricsFavoriteDaoTest.java b/hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/MetricsFavoriteDaoTest.java index ec7857341b..00c50988ab 100644 --- a/hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/MetricsFavoriteDaoTest.java +++ b/hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/MetricsFavoriteDaoTest.java @@ -18,6 +18,8 @@ package org.apache.hertzbeat.startup.dao; import jakarta.annotation.Resource; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; import org.apache.hertzbeat.common.entity.manager.MetricsFavorite; import org.apache.hertzbeat.manager.dao.MetricsFavoriteDao; import org.apache.hertzbeat.startup.AbstractSpringIntegrationTest; @@ -48,6 +50,9 @@ class MetricsFavoriteDaoTest extends AbstractSpringIntegrationTest { @Resource private MetricsFavoriteDao metricsFavoriteDao; + @PersistenceContext + private EntityManager entityManager; + private MetricsFavorite testFavorite1; private MetricsFavorite testFavorite2; private MetricsFavorite testFavorite3; @@ -142,6 +147,8 @@ class MetricsFavoriteDaoTest extends AbstractSpringIntegrationTest { assertTrue(metricsFavoriteDao.findById(saved.getId()).isPresent()); metricsFavoriteDao.deleteByUserIdAndMonitorIdAndMetricsName(testCreator1, testMonitorId1, testMetricsName1); + entityManager.flush(); + entityManager.clear(); assertFalse(metricsFavoriteDao.findById(saved.getId()).isPresent()); } @@ -163,6 +170,8 @@ class MetricsFavoriteDaoTest extends AbstractSpringIntegrationTest { Set monitorIds = Set.of(testMonitorId1, testMonitorId2); metricsFavoriteDao.deleteFavoritesByMonitorIdIn(monitorIds); + entityManager.flush(); + entityManager.clear(); assertEquals(0, metricsFavoriteDao.findAll().size()); assertFalse(metricsFavoriteDao.findById(saved1.getId()).isPresent()); @@ -177,6 +186,8 @@ class MetricsFavoriteDaoTest extends AbstractSpringIntegrationTest { Set monitorIds = Set.of(testMonitorId1); metricsFavoriteDao.deleteFavoritesByMonitorIdIn(monitorIds); + entityManager.flush(); + entityManager.clear(); assertEquals(1, metricsFavoriteDao.findAll().size()); assertFalse(metricsFavoriteDao.findById(saved1.getId()).isPresent()); diff --git a/hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/NoticeRuleDaoTest.java b/hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/NoticeRuleDaoTest.java index a471958689..44d0160e2f 100644 --- a/hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/NoticeRuleDaoTest.java +++ b/hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/NoticeRuleDaoTest.java @@ -60,8 +60,7 @@ class NoticeRuleDaoTest extends AbstractSpringIntegrationTest { // insert notice rule with enable = false NoticeRule disabled = NoticeRule.builder() - .id(2L) - .name("mock notice rule") + .name("mock notice rule disabled") .enable(false) .filterAll(true) .gmtCreate(LocalDateTime.now()) diff --git a/hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/db/GreptimeSqlQueryExecutor.java b/hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/db/GreptimeSqlQueryExecutor.java index 9d874868c6..42bbb2efc9 100644 --- a/hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/db/GreptimeSqlQueryExecutor.java +++ b/hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/db/GreptimeSqlQueryExecutor.java @@ -93,8 +93,9 @@ public class GreptimeSqlQueryExecutor extends SqlQueryExecutor { if (responseEntity.getStatusCode().is2xxSuccessful()) { GreptimeSqlQueryContent responseBody = responseEntity.getBody(); - if (responseBody != null && responseBody.getCode() == 0 - && responseBody.getOutput() != null && !responseBody.getOutput().isEmpty()) { + // GreptimeDB SQL HTTP API may not return 'code' field in successful response + // Check if output exists and is not empty + if (responseBody != null && responseBody.getOutput() != null && !responseBody.getOutput().isEmpty()) { for (GreptimeSqlQueryContent.Output output : responseBody.getOutput()) { if (output.getRecords() != null && output.getRecords().getRows() != null) { diff --git a/hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/doris/DorisStreamLoadWriter.java b/hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/doris/DorisStreamLoadWriter.java index d45213a91e..dac3ca1d12 100644 --- a/hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/doris/DorisStreamLoadWriter.java +++ b/hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/doris/DorisStreamLoadWriter.java @@ -17,7 +17,7 @@ package org.apache.hertzbeat.warehouse.store.history.tsdb.doris; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.binary.Base64; diff --git a/hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/greptime/GreptimeSqlQueryContent.java b/hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/greptime/GreptimeSqlQueryContent.java index 7efa79fcc4..a6d510fd2f 100644 --- a/hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/greptime/GreptimeSqlQueryContent.java +++ b/hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/greptime/GreptimeSqlQueryContent.java @@ -34,12 +34,12 @@ import java.util.List; @NoArgsConstructor public class GreptimeSqlQueryContent { - private int code; - + private Integer code; + private List output; - + @JsonProperty("execution_time_ms") - private long executionTimeMs; + private Long executionTimeMs; /** * Represents the output of a GreptimeDB SQL query. diff --git a/hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/vm/VictoriaMetricsClusterDataStorage.java b/hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/vm/VictoriaMetricsClusterDataStorage.java index dc27adac27..ae93a1e7e2 100644 --- a/hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/vm/VictoriaMetricsClusterDataStorage.java +++ b/hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/vm/VictoriaMetricsClusterDataStorage.java @@ -17,7 +17,7 @@ package org.apache.hertzbeat.warehouse.store.history.tsdb.vm; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/hertzbeat-warehouse/src/test/java/org/apache/hertzbeat/warehouse/service/WarehouseServiceTest.java b/hertzbeat-warehouse/src/test/java/org/apache/hertzbeat/warehouse/service/WarehouseServiceTest.java index bf7e4ddd05..bbee51e00f 100644 --- a/hertzbeat-warehouse/src/test/java/org/apache/hertzbeat/warehouse/service/WarehouseServiceTest.java +++ b/hertzbeat-warehouse/src/test/java/org/apache/hertzbeat/warehouse/service/WarehouseServiceTest.java @@ -6,7 +6,7 @@ * (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 + * 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, @@ -21,6 +21,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import java.util.Collections; @@ -67,7 +68,8 @@ class WarehouseServiceTest { List result = warehouseService.queryMonitorMetricsData(monitorId); assertEquals(expectedData, result); - verify(realTimeDataStorage, never()).isServerAvailable(); + verify(realTimeDataStorage, times(1)).isServerAvailable(); + verify(realTimeDataStorage, times(1)).getCurrentMetricsData(monitorId); } @Test @@ -80,6 +82,7 @@ class WarehouseServiceTest { List result = warehouseService.queryMonitorMetricsData(monitorId); assertTrue(result.isEmpty()); + verify(realTimeDataStorage, times(1)).isServerAvailable(); verify(realTimeDataStorage, never()).getCurrentMetricsData(anyLong()); } } diff --git a/home/docs/community/contribution.md b/home/docs/community/contribution.md index cbb606d268..72b823e716 100644 --- a/home/docs/community/contribution.md +++ b/home/docs/community/contribution.md @@ -52,7 +52,7 @@ Even small corrections to typos are very welcome :) #### Backend start -1. Requires `maven3+`, `java17` and `lombok` environments +1. Requires `maven3+`, `java21` and `lombok` environments 2. (Optional) Modify the configuration file: `hertzbeat-startup/src/main/resources/application.yml` 3. Execute under the project root directory: `mvn clean install -DskipTests` 4. Add VM Options: `--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED` diff --git a/home/docs/community/development.md b/home/docs/community/development.md index d8764e7e1d..fd2c83327c 100644 --- a/home/docs/community/development.md +++ b/home/docs/community/development.md @@ -12,7 +12,7 @@ sidebar_label: Development ### Backend start -1. Requires `maven3+`, `java17` and `lombok` environments +1. Requires `maven3+`, `java21` and `lombok` environments 2. (Optional) Modify the configuration file: `hertzbeat-startup/src/main/resources/application.yml` 3. Execute under the project root directory: `mvn clean install -DskipTests` 4. Add VM Options: `--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED` @@ -34,7 +34,7 @@ sidebar_label: Development ## Build HertzBeat binary package -> Requires `maven3+`, `java17`, `node` and `pnpm` environments. +> Requires `maven3+`, `java21`, `node` and `pnpm` environments. ### Frontend build @@ -50,7 +50,7 @@ sidebar_label: Development ### Backend build -1. Requires `maven3+`, `java17` environments +1. Requires `maven3+`, `java21` environments 2. Execute under the project root directory: `mvn clean package -Prelease` @@ -58,7 +58,7 @@ The HertzBeat install package will at `dist/hertzbeat-{version}.tar.gz` ### Collector build -1. Requires `maven3+`, `java17` environments +1. Requires `maven3+`, `java21` environments 2. Execute under the project root directory: `mvn clean install` diff --git a/home/docs/community/how-to-release.md b/home/docs/community/how-to-release.md index 3067b17dc5..6deb97d01b 100644 --- a/home/docs/community/how-to-release.md +++ b/home/docs/community/how-to-release.md @@ -10,7 +10,7 @@ This tutorial describes in detail how to release Apache HertzBeat™, take the r This release process is operated in the UbuntuOS(Windows,Mac), and the following tools are required: -- JDK 17 +- JDK 21 - Node18 pnpm - Apache Maven 3.x - GnuPG 2.x diff --git a/home/docs/download.md b/home/docs/download.md index 3ac41d419c..fde53959f4 100644 --- a/home/docs/download.md +++ b/home/docs/download.md @@ -22,7 +22,7 @@ Download the latest Apache HertzBeat™ release (v1.8.0) as server binary, colle |-------------|------|---------|----------| | **Server Binary** | ~200MB | Main monitoring server | Linux, macOS, Windows | | **Collector Binary** | ~50MB | Distributed collectors | Linux, macOS, Windows | -| **Source Code** | ~30MB | Build from source | Any with Java 17+ | +| **Source Code** | ~30MB | Build from source | Any with Java 21+ | | **Docker Compose** | ~5MB | Full stack deployment | Docker environments | :::tip Security Verification @@ -73,13 +73,13 @@ Import Apache HertzBeat KEYS first: `wget https://downloads.apache.org/hertzbeat ### What are the system requirements? **Server Binary Requirements:** -- Java 17 or higher +- Java 21 or higher - 4GB RAM minimum (8GB recommended) - 2 CPU cores minimum - 20GB disk space **Collector Binary Requirements:** -- Java 17 or higher +- Java 21 or higher - 2GB RAM minimum - 1 CPU core minimum - 5GB disk space diff --git a/home/docs/help/risc-v.md b/home/docs/help/risc-v.md index 6e44b36c6c..41d605afe8 100644 --- a/home/docs/help/risc-v.md +++ b/home/docs/help/risc-v.md @@ -48,7 +48,7 @@ Reference: [Ubuntu Official Documentation](https://canonical-ubuntu-boards.readt ## Install and Configure RISC-V-Compatible JDK -> Configure a JDK that supports RISC-V architecture. Here we use Temurin JDK 17. +> Configure a JDK that supports RISC-V architecture. Here we use Temurin JDK 21. **1. Download Temurin JDK** Download link: [https://adoptium.net/temurin/releases](https://adoptium.net/temurin/releases) @@ -66,11 +66,11 @@ sudo apt install -y tar wget sudo mkdir -p /usr/lib/jvm # Extract to system directory -sudo tar -xzf OpenJDK17U-jdk_riscv64_linux_hotspot_17.0.15_6.tar.gz -C /usr/lib/jvm +sudo tar -xzf OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.2_13.tar.gz -C /usr/lib/jvm # Edit environment variables sudo nano /etc/profile.d/java.sh -export JAVA_HOME=/usr/lib/jvm/jdk-17.0.15+6 +export JAVA_HOME=/usr/lib/jvm/jdk-21.0.2+13 export PATH=$JAVA_HOME/bin:$PATH # Apply configuration @@ -91,6 +91,6 @@ cd apache-hertzbeat-1.7.2-incubating-bin/bin/ > Notes: > -> 1. Replace `OpenJDK17U-jdk_riscv64_linux_hotspot_17.0.15_6.tar.gz` with your actual JDK filename. +> 1. Replace `OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.2_13.tar.gz` with your actual JDK filename. > 2. Ensure the emulator has internet access to download HertzBeat. > 3. If issues arise, verify disk permissions and Java environment paths. diff --git a/home/docs/start/mysql-change.md b/home/docs/start/mysql-change.md index b817caca8a..b6d91c0180 100644 --- a/home/docs/start/mysql-change.md +++ b/home/docs/start/mysql-change.md @@ -77,12 +77,13 @@ spring: jpa: show-sql: false - database-platform: org.eclipse.persistence.platform.database.MySQLPlatform database: h2 + hibernate: + ddl-auto: update properties: - eclipselink: - logging: - level: SEVERE + hibernate: + dialect: org.hibernate.dialect.H2Dialect + format_sql: true ``` Specific replacement parameters are as follows and you need to configure account according to the mysql environment: @@ -98,12 +99,13 @@ spring: max-lifetime: 120000 jpa: show-sql: false - database-platform: org.eclipse.persistence.platform.database.MySQLPlatform database: mysql + hibernate: + ddl-auto: update properties: - eclipselink: - logging: - level: SEVERE + hibernate: + dialect: org.hibernate.dialect.MySQLDialect + format_sql: true ``` - It is recommended to set the host field in the MySQL URL to the public IP address when using Hertzbeat in docker. diff --git a/home/docs/start/package-deploy.md b/home/docs/start/package-deploy.md index 45f913886e..0747d7821d 100644 --- a/home/docs/start/package-deploy.md +++ b/home/docs/start/package-deploy.md @@ -1,16 +1,16 @@ --- -id: package-deploy -title: Install HertzBeat via Package +id: package-deploy +title: Install HertzBeat via Package sidebar_label: Install via Package --- :::tip You can install and run Apache HertzBeat™ on Linux Windows Mac system, and CPU supports X86/ARM64. -Since version 1.6.0 uses `Java 17` and the installation package no longer provides a built-in JDK version, use the new Hertzbeat according to the following situations: +Since version 1.6.0 uses `Java 21` and the installation package no longer provides a built-in JDK version, use the new Hertzbeat according to the following situations: -- When the default environment variable on your server is `Java 17`, you do not need to take any action for this step. -- When the default environment variable on your server is not `Java 17`, such as `Java 8` or `Java 11`, and if there are no other applications on your server that require a lower version of Java, download the appropriate version from [https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html) according to your system, and search the engine for how to set a new environment variable pointing to the new `Java 17`. -- When the default environment variable on your server is not `Java 17`, such as `Java 8` or `Java 11`,and you don't want to change the environment variable because if there are other applications on your server that require a lower version of Java, download the appropriate version from [https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html) according to your system, and rename the extracted folder to `java`, then copy it to the Hertzbeat extraction directory. +- When the default environment variable on your server is `Java 21`, you do not need to take any action for this step. +- When the default environment variable on your server is not `Java 21`, such as `Java 8` or `Java 11`, and if there are no other applications on your server that require a lower version of Java, download the appropriate version from [https://www.oracle.com/java/technologies/javase/jdk21-archive-downloads.html](https://www.oracle.com/java/technologies/javase/jdk21-archive-downloads.html) according to your system, and search the engine for how to set a new environment variable pointing to the new `Java 21`. +- When the default environment variable on your server is not `Java 21`, such as `Java 8` or `Java 11`,and you don't want to change the environment variable because if there are other applications on your server that require a lower version of Java, download the appropriate version from [https://www.oracle.com/java/technologies/javase/jdk21-archive-downloads.html](https://www.oracle.com/java/technologies/javase/jdk21-archive-downloads.html) according to your system, and rename the extracted folder to `java`, then copy it to the Hertzbeat extraction directory. ::: @@ -50,7 +50,7 @@ Since version 1.6.0 uses `Java 17` and the installation package no longer provid Execute the startup script in the installation directory `bin/`, or `startup.bat` in windows. ```shell - ./startup.sh + ./startup.sh ``` 5. Begin to explore HertzBeat @@ -117,21 +117,21 @@ Deploying multiple HertzBeat Collectors can achieve high availability, load bala 1. you need to prepare the JAVA environment in advance Install JAVA runtime environment-refer to [official website](https://www.oracle.com/java/technologies/downloads/) - requirement：JDK17 ENV + requirement：JDK21 ENV download JAVA installation package: [mirror website](https://mirrors.huaweicloud.com/openjdk/) After installation use command line to check whether you install it successfully. ```shell $ java -version - java version "17.0.9" - Java(TM) SE Runtime Environment 17.0.9 (build 17.0.9+8-LTS-237) - Java HotSpot(TM) 64-Bit Server VM 17.0.9 (build 17.0.9+8-LTS-237, mixed mode) + openjdk version "21.0.9" 2025-10-21 LTS + OpenJDK Runtime Environment Corretto-21.0.9.10.1 (build 21.0.9+10-LTS) + OpenJDK 64-Bit Server VM Corretto-21.0.9.10.1 (build 21.0.9+10-LTS, mixed mode, sharing) ``` 2. According to the process deploy，visit [http://ip:1157/](http://ip:1157/) no interface Please refer to the following points to troubleshoot issues: - > 1：If you switch to dependency service MYSQL database，check whether the database is created and started successfully. - > 2：Check whether dependent services, IP account and password configuration is correct in HertzBeat's configuration file `hertzbeat/config/application.yml`. + > 1：If you switch to dependency service MYSQL database，check whether the database is created and started successfully. + > 2：Check whether dependent services, IP account and password configuration is correct in HertzBeat's configuration file `hertzbeat/config/application.yml`. > 3：Check whether the running log has errors in `hertzbeat/logs/` directory. If you haven't solved the issue, report it to the communication group or community. diff --git a/home/docs/start/postgresql-change.md b/home/docs/start/postgresql-change.md index 4b25fbf350..f1c98e7456 100644 --- a/home/docs/start/postgresql-change.md +++ b/home/docs/start/postgresql-change.md @@ -67,12 +67,13 @@ spring: jpa: show-sql: false - database-platform: org.eclipse.persistence.platform.database.MySQLPlatform database: h2 + hibernate: + ddl-auto: update properties: - eclipselink: - logging: - level: SEVERE + hibernate: + dialect: org.hibernate.dialect.H2Dialect + format_sql: true ``` Specific replacement parameters are as follows and you need to configure account, ip, port according to the postgresql environment: @@ -88,12 +89,13 @@ spring: max-lifetime: 120000 jpa: show-sql: false - database-platform: org.eclipse.persistence.platform.database.PostgreSQLPlatform database: postgresql + hibernate: + ddl-auto: update properties: - eclipselink: - logging: - level: SEVERE + hibernate: + dialect: org.hibernate.dialect.PostgreSQLDialect + format_sql: true ``` > Note: The above applies to the method of downloading and installing the package. For local data source switching, simply complete the [Database creation](./postgresql-change#database-creation) and modify the configuration in `hertzbeat-startup/src/main/resources/application.yml`. diff --git a/home/docs/start/quickstart.md b/home/docs/start/quickstart.md index 1e3af2776e..ddb24cab1e 100644 --- a/home/docs/start/quickstart.md +++ b/home/docs/start/quickstart.md @@ -82,7 +82,7 @@ Detailed config refer to [Install HertzBeat via Package](package-deploy) ##### 3：Start via source code 1. Local source code debugging needs to start the back-end project `manager` and the front-end project `web-app`. -2. Backend：need `maven3+`, `java17`, `lombok`, start the `hertzbeat-startup` service. +2. Backend：need `maven3+`, `java21`, `lombok`, start the `hertzbeat-startup` service. 3. Web：need `nodejs npm angular-cli` environment, Run `ng serve --open` in `web-app` directory after backend startup. 4. Access `http://localhost:4200` to start, default account: `admin/hertzbeat` @@ -108,7 +108,7 @@ Detailed steps refer to [Artifact Hub](https://artifacthub.io/packages/helm/hert - 2 CPU cores - 4GB RAM - 10GB disk space -- Docker 20.10+ or Java 17+ +- Docker 20.10+ or Java 21+ **Operating Systems:** Linux, macOS, Windows (via Docker or WSL) diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/contribution.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/contribution.md index d2768231e7..fe530b8bc0 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/contribution.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/contribution.md @@ -52,7 +52,7 @@ limitations under the License. #### 后端启动 -1. 需要 `maven3+`, `java17` 和 `lombok` 环境 +1. 需要 `maven3+`, `java21` 和 `lombok` 环境 2. (可选)修改配置文件配置信息-`hertzbeat-startup/src/main/resources/application.yml` diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/development.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/development.md index 30a1c479cc..76b20f0d2a 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/development.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/development.md @@ -11,7 +11,7 @@ sidebar_label: 运行编译 ### 后端启动 -1. 需要 `maven3+`, `java17` 和 `lombok` 环境 +1. 需要 `maven3+`, `java21` 和 `lombok` 环境 2. (可选)修改配置文件配置信息-`hertzbeat-startup/src/main/resources/application.yml` @@ -37,7 +37,7 @@ sidebar_label: 运行编译 ## 生成二进制包 -> 需要 `maven3+`, `java17`, `node` 和 `pnpm` 环境. +> 需要 `maven3+`, `java21`, `node` 和 `pnpm` 环境. ### 前端打包 @@ -53,7 +53,7 @@ sidebar_label: 运行编译 ### 后端打包 -1. 需要 `maven3+`, `java17` 环境 +1. 需要 `maven3+`, `java21` 环境 2. 在项目根目录运行: `mvn clean package -Prelease` @@ -61,7 +61,7 @@ HertzBeat 包将生成为 `dist/hertzbeat-{version}.tar.gz` ### 采样器打包 -1. 需要 `maven3+`, `java17` 环境 +1. 需要 `maven3+`, `java21` 环境 2. 在项目根目录运行: `mvn clean install` diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/how-to-release.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/how-to-release.md index e6e088f0b5..b0d5ae4239 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/how-to-release.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/community/how-to-release.md @@ -10,7 +10,7 @@ sidebar_position: 4 此发布过程在 UbuntuOS(可在 Windows Mac) 中进行操作，并需要以下环境： -- JDK 17 +- JDK 21 - Node18 pnpm - Apache Maven 3.x - GnuPG 2.x diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/download.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/download.md index 50e38625a0..2325660f32 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/download.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/download.md @@ -22,7 +22,7 @@ description: Apache HertzBeat 监控系统下载 - 服务器、采集器、源 |--------|------|------|------| | **服务器二进制** | ~200MB | 主监控服务器 | Linux、macOS、Windows | | **采集器二进制** | ~50MB | 分布式采集器 | Linux、macOS、Windows | -| **源码** | ~30MB | 从源码构建 | 任何支持 Java 17+ 的平台 | +| **源码** | ~30MB | 从源码构建 | 任何支持 Java 21+ 的平台 | | **Docker Compose** | ~5MB | 全栈部署 | Docker 环境 | :::tip 安全验证 @@ -73,13 +73,13 @@ description: Apache HertzBeat 监控系统下载 - 服务器、采集器、源 ### 系统要求是什么？ **服务器二进制要求：** -- Java 17 或更高版本 +- Java 21 或更高版本 - 4GB RAM 最低（推荐 8GB） - 2 CPU 核心 最低 - 20GB 磁盘空间 **采集器二进制要求：** -- Java 17 或更高版本 +- Java 21 或更高版本 - 2GB RAM 最低 - 1 CPU 核心 最低 - 5GB 磁盘空间 diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/risc-v.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/risc-v.md index 36cb6b1790..f931b56102 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/risc-v.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/help/risc-v.md @@ -45,7 +45,7 @@ qemu-system-riscv64 \ ## 安装并配置支持 RISC-V 架构的 JDK -> 在启动的镜像中配置支持 RISC-V 架构的 JDK，这里选用 Temurin JDK 17。 +> 在启动的镜像中配置支持 RISC-V 架构的 JDK，这里选用 Temurin JDK 21。 **1. 下载 Temurin JDK** @@ -63,11 +63,11 @@ sudo apt install -y tar wget # 创建安装目录 sudo mkdir -p /usr/lib/jvm # 解压到系统目录 -sudo tar -xzf OpenJDK17U-jdk_riscv64_linux_hotspot_17.0.15_6.tar.gz -C /usr/lib/jvm +sudo tar -xzf OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.2_13.tar.gz -C /usr/lib/jvm # 编辑环境变量，添加以下内容 sudo nano /etc/profile.d/java.sh -export JAVA_HOME=/usr/lib/jvm/jdk-17.0.15+6 +export JAVA_HOME=/usr/lib/jvm/jdk-21.0.2+13 export PATH=$JAVA_HOME/bin:$PATH # 使配置生效 @@ -88,6 +88,6 @@ cd apache-hertzbeat-1.7.2-incubating-bin/bin/ > 注意事项： > -> 1. 请将 `OpenJDK17U-jdk_riscv64_linux_hotspot_17.0.15_6.tar.gz` 替换为您实际下载的 JDK 文件名。 +> 1. 请将 `OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.2_13.tar.gz` 替换为您实际下载的 JDK 文件名。 > 2. 确保模拟器具备网络访问能力，以下载 HertzBeat。 > 3. 若遇到问题，请检查磁盘权限和 Java 环境路径配置。 diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/mysql-change.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/mysql-change.md index ba579d3ced..a40cbc20fb 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/mysql-change.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/mysql-change.md @@ -80,12 +80,13 @@ spring: jpa: show-sql: false - database-platform: org.eclipse.persistence.platform.database.MySQLPlatform database: h2 + hibernate: + ddl-auto: update properties: - eclipselink: - logging: - level: SEVERE + hibernate: + dialect: org.hibernate.dialect.H2Dialect + format_sql: true ``` 具体替换参数如下,需根据mysql环境配置账户密码IP: @@ -101,12 +102,13 @@ spring: max-lifetime: 120000 jpa: show-sql: false - database-platform: org.eclipse.persistence.platform.database.MySQLPlatform database: mysql + hibernate: + ddl-auto: update properties: - eclipselink: - logging: - level: SEVERE + hibernate: + dialect: org.hibernate.dialect.MySQLDialect + format_sql: true ``` - 通过docker启动时，建议修改host为宿主机的外网IP地址，包括mysql连接字符串。 diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/package-deploy.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/package-deploy.md index d55c0476cd..b34768ac98 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/package-deploy.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/package-deploy.md @@ -1,16 +1,16 @@ --- -id: package-deploy -title: 通过安装包安装 HertzBeat +id: package-deploy +title: 通过安装包安装 HertzBeat sidebar_label: 安装包方式安装 --- :::tip Apache HertzBeat™ 支持在Linux Windows Mac系统安装运行，CPU支持X86/ARM64。 -由于1.6.0及以后版本使用 `Java 17` ，且安装包不再提供内置jdk的版本，参考以下情况使用新版Hertzbeat。 +由于1.6.0及以后版本使用 `Java 21` ，且安装包不再提供内置jdk的版本，参考以下情况使用新版Hertzbeat。 -- 当你的服务器中默认环境变量为 `Java 17` 时，这一步你无需任何操作。 -- 当你的服务器中默认环境变量不为 `Java 17`时，如 `Java 8` 、 `Java 11` ，若你服务器中**没有**其他应用需要低版本 `Java` ，根据你的系统，到 [https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html) 选择相应的发行版下载，并在搜索引擎搜索如何设置新的环境变量指向新的`Java 17`。 -- 当你的服务器中默认环境变量不为`Java 17`时，如 `Java 8` 、 `Java 11` ，若你服务器中**有**其他应用需要低版本 `Java` ，你不想更改环境变量，根据你的系统，到 [https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html) 选择相应的发行版下载，并将解压后的文件夹重命名为`java`，复制到Hertzbeat的解压目录下。 +- 当你的服务器中默认环境变量为 `Java 21` 时，这一步你无需任何操作。 +- 当你的服务器中默认环境变量不为 `Java 21`时，如 `Java 8` 、 `Java 11` ，若你服务器中**没有**其他应用需要低版本 `Java` ，根据你的系统，到 [https://www.oracle.com/java/technologies/javase/jdk21-archive-downloads.html](https://www.oracle.com/java/technologies/javase/jdk21-archive-downloads.html) 选择相应的发行版下载，并在搜索引擎搜索如何设置新的环境变量指向新的`Java 21`。 +- 当你的服务器中默认环境变量不为`Java 21`时，如 `Java 8` 、 `Java 11` ，若你服务器中**有**其他应用需要低版本 `Java` ，你不想更改环境变量，根据你的系统，到 [https://www.oracle.com/java/technologies/javase/jdk21-archive-downloads.html](https://www.oracle.com/java/technologies/javase/jdk21-archive-downloads.html) 选择相应的发行版下载，并将解压后的文件夹重命名为`java`，复制到Hertzbeat的解压目录下。 ::: @@ -40,7 +40,7 @@ Apache HertzBeat™ 支持在Linux Windows Mac系统安装运行，CPU支持X86/ 3. 配置账户文件(可选) - HertzBeat 默认内置三个用户账户,分别为 admin/hertzbeat tom/hertzbeat guest/hertzbeat + HertzBeat 默认内置三个用户账户,分别为 admin/hertzbeat tom/hertzbeat guest/hertzbeat 若需要新增删除修改账户或密码，可以通过修改位于 `config/sureness.yml` 的配置文件实现，具体参考 - [配置修改账户密码](account-modify) @@ -50,7 +50,7 @@ Apache HertzBeat™ 支持在Linux Windows Mac系统安装运行，CPU支持X86/ 执行位于安装目录 bin 下的启动脚本 startup.sh, windows 环境下为 startup.bat ```shell - ./startup.sh + ./startup.sh ``` 5. 开始探索HertzBeat @@ -103,10 +103,10 @@ HertzBeat Collector 是一个轻量级的数据采集器，用于采集并将数 执行位于安装目录 hertzbeat-collector/bin/ 下的启动脚本 startup.sh, windows 环境下为 startup.bat ```shell - ./startup.sh + ./startup.sh ``` -4. 开始探索 HertzBeat Collector +4. 开始探索 HertzBeat Collector 浏览器访问 [http://ip:1157/](http://ip:1157/) 即可开始探索使用，默认账户密码 admin/hertzbeat。 **HAVE FUN** @@ -119,21 +119,22 @@ HertzBeat Collector 是一个轻量级的数据采集器，用于采集并将数 1. 启动失败，需您提前准备JAVA运行环境 - 安装JAVA运行环境-可参考[官方网站](https://www.oracle.com/java/technologies/downloads/) - 要求：JAVA17环境 - 下载JAVA安装包: [镜像站](https://mirrors.huaweicloud.com/openjdk/) + 安装JAVA运行环境-可参考[官方网站](https://www.oracle.com/java/technologies/downloads/) + 要求：JAVA21环境 + 下载JAVA安装包: [镜像站](https://mirrors.huaweicloud.com/openjdk/) 安装后命令行检查是否成功安装 ```shell $ java -version - java version "17.0.9" - Java(TM) SE Runtime Environment 17.0.9 (build 17.0.9+8-LTS-237) - Java HotSpot(TM) 64-Bit Server VM 17.0.9 (build 17.0.9+8-LTS-237, mixed mode) + openjdk version "21.0.9" 2025-10-21 LTS + OpenJDK Runtime Environment Corretto-21.0.9.10.1 (build 21.0.9+10-LTS) + OpenJDK 64-Bit Server VM Corretto-21.0.9.10.1 (build 21.0.9+10-LTS, mixed mode, sharing) + ``` 2. 按照流程部署，访问 [http://ip:1157/](http://ip:1157/) 无界面 请参考下面几点排查问题： - > 一：若切换了依赖服务MYSQL数据库，排查数据库是否成功创建，是否启动成功 - > 二：HertzBeat的配置文件 `hertzbeat/config/application.yml` 里面的依赖服务IP账户密码等配置是否正确 + > 一：若切换了依赖服务MYSQL数据库，排查数据库是否成功创建，是否启动成功 + > 二：HertzBeat的配置文件 `hertzbeat/config/application.yml` 里面的依赖服务IP账户密码等配置是否正确 > 三：若都无问题可以查看 `hertzbeat/logs/` 目录下面的运行日志是否有明显错误，提issue或交流群或社区反馈 diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/postgresql-change.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/postgresql-change.md index a7e083b9f5..172802aefe 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/postgresql-change.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/postgresql-change.md @@ -23,7 +23,7 @@ PostgreSQL 是一个功能强大，开源的关系型数据库管理系统（RDB 2. Docker 安装 PostgreSQL ```shell - docker run -d --name postgresql -p 5432:5432 -e POSTGRES_USER=root -e POSTGRES_PASSWORD=123456 -e TZ=Asia/Shanghai postgres:15 + docker run -d --name postgresql -p 5432:5432 -e POSTGRES_USER=root -e POSTGRES_PASSWORD=123456 -e TZ=Asia/Shanghai postgres:15 ``` 使用 ```$ docker ps``` 查看数据库是否启动成功 @@ -69,12 +69,13 @@ spring: jpa: show-sql: false - database-platform: org.eclipse.persistence.platform.database.MySQLPlatform database: h2 + hibernate: + ddl-auto: update properties: - eclipselink: - logging: - level: SEVERE + hibernate: + dialect: org.hibernate.dialect.H2Dialect + format_sql: true ``` 具体替换参数如下,需根据 PostgreSQL 环境配置账户密码 IP: @@ -90,14 +91,15 @@ spring: max-lifetime: 120000 jpa: show-sql: false - database-platform: org.eclipse.persistence.platform.database.PostgreSQLPlatform database: postgresql + hibernate: + ddl-auto: update properties: - eclipselink: - logging: - level: SEVERE + hibernate: + dialect: org.hibernate.dialect.PostgreSQLDialect + format_sql: true ``` -> 注意：上述是针对下载安装包的方式，对于本地切换数据源，只需完成[数据库创建](./postgresql-change#数据库创建)以及修改`hertzbeat-startup/src/main/resources/application.yml`中的配置即可。 +> 注意：上述是针对下载安装包的方式，对于本地切换数据源,只需完成[数据库创建](./postgresql-change#数据库创建)以及修改`hertzbeat-startup/src/main/resources/application.yml`中的配置即可。 -**启动 HertzBeat 浏览器访问 [http://ip:1157/](http://ip:1157/) 开始使用HertzBeat进行监控告警，默认账户密码 admin/hertzbeat** +**启动 HertzBeat 浏览器访问 [http://ip:1157/](http://ip:1157/) 开始使用HertzBeat进行监控告警,默认账户密码 admin/hertzbeat** diff --git a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/quickstart.md b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/quickstart.md index b20c8b384a..9723ac7357 100644 --- a/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/quickstart.md +++ b/home/i18n/zh-cn/docusaurus-plugin-content-docs/current/start/quickstart.md @@ -86,7 +86,7 @@ HertzBeat 提供四种安装选项： #### 方式三：本地代码启动 1. 此为前后端分离项目，本地代码调试需要分别启动后端工程`hertzbeat-startup`和前端工程`web-app` -2. 后端：需要`maven3+`, `java17`和`lombok`环境，修改`YML`配置信息并启动`hertzbeat-startup`服务 +2. 后端：需要`maven3+`, `java21`和`lombok`环境，修改`YML`配置信息并启动`hertzbeat-startup`服务 3. 前端：需要`nodejs npm angular-cli`环境，待本地后端启动后，在`web-app`目录下启动 `ng serve --open` 4. 浏览器访问 `http://localhost:4200` 即可开始，默认账号密码 `admin/hertzbeat` @@ -112,7 +112,7 @@ HertzBeat 提供四种安装选项： - 2 CPU 核心 - 4GB RAM - 10GB 磁盘空间 -- Docker 20.10+ 或 Java 17+ +- Docker 20.10+ 或 Java 21+ **支持系统：** Linux、macOS、Windows（通过 Docker 或 WSL） diff --git a/home/src/components/StructuredData.js b/home/src/components/StructuredData.js index 0d366d76a3..97472f05e6 100644 --- a/home/src/components/StructuredData.js +++ b/home/src/components/StructuredData.js @@ -55,7 +55,7 @@ export default function StructuredData() { "Cloud-edge collaboration for isolated networks", "Status page builder for service communication" ], - "softwareRequirements": "Docker 20.10+ or Java 17+", + "softwareRequirements": "Docker 20.10+ or Java 21+", "memoryRequirements": "4GB minimum, 8GB recommended", "processorRequirements": "2 CPU cores minimum", "storageRequirements": "10GB minimum" diff --git a/home/src/pages/faq.js b/home/src/pages/faq.js index 7a5841b085..cc6d74af08 100644 --- a/home/src/pages/faq.js +++ b/home/src/pages/faq.js @@ -46,7 +46,7 @@ const faqs = [ }, { question: "What are HertzBeat's system requirements?", - answer: "Minimum: 2 CPU cores, 4GB RAM (8GB recommended), 10GB disk space, Docker 20.10+ or Java 17+. Supported on Linux, macOS, Windows." + answer: "Minimum: 2 CPU cores, 4GB RAM (8GB recommended), 10GB disk space, Docker 20.10+ or Java 21+. Supported on Linux, macOS, Windows." }, { question: "How do I upgrade HertzBeat?", diff --git a/home/src/pages/zh-cn/faq.js b/home/src/pages/zh-cn/faq.js index 0e55856c63..ae16a05b41 100644 --- a/home/src/pages/zh-cn/faq.js +++ b/home/src/pages/zh-cn/faq.js @@ -46,7 +46,7 @@ const faqs = [ }, { question: "HertzBeat 的系统要求是什么？", - answer: "最低：2 CPU 核心、4GB RAM（推荐 8GB）、10GB 磁盘空间、Docker 20.10+ 或 Java 17+。支持系统：Linux、macOS、Windows。" + answer: "最低：2 CPU 核心、4GB RAM（推荐 8GB）、10GB 磁盘空间、Docker 20.10+ 或 Java 21+。支持系统：Linux、macOS、Windows。" }, { question: "如何升级 HertzBeat？", diff --git a/home/static/llms-zh.txt b/home/static/llms-zh.txt index 37aff08d46..0ae302d469 100644 --- a/home/static/llms-zh.txt +++ b/home/static/llms-zh.txt @@ -57,7 +57,7 @@ cd apache-hertzbeat-1.8.0 - 2 CPU 核心 最低 - 4GB RAM 最低（推荐 8GB） - 10GB 磁盘空间 -- Docker 20.10+ 或 Java 17+ +- Docker 20.10+ 或 Java 21+ - 平台：Linux、macOS、Windows ## 支持的监控类型 diff --git a/home/static/llms.txt b/home/static/llms.txt index df2060e94b..18ab6d7bbf 100644 --- a/home/static/llms.txt +++ b/home/static/llms.txt @@ -57,7 +57,7 @@ cd apache-hertzbeat-1.8.0 - 2 CPU cores minimum - 4GB RAM minimum (8GB recommended) - 10GB disk space -- Docker 20.10+ or Java 17+ +- Docker 20.10+ or Java 21+ - Platforms: Linux, macOS, Windows ## Supported Monitoring Types diff --git a/material/licenses/LICENSE b/material/licenses/LICENSE index 5fbf69e981..dd1c37687e 100644 --- a/material/licenses/LICENSE +++ b/material/licenses/LICENSE @@ -1,3 +1,4 @@ + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -515,11 +516,6 @@ The text of each license is also included in licenses/LICENSE-[project].txt. https://mvnrepository.com/artifact/jakarta.transaction/jakarta.transaction-api/2.0.1 https://mvnrepository.com/artifact/org.eclipse.angus/jakarta.mail/2.0.2 https://mvnrepository.com/artifact/org.aspectj/aspectjweaver/1.9.21 - https://mvnrepository.com/artifact/org.eclipse.persistence/eclipselink/4.0.2 - https://mvnrepository.com/artifact/org.eclipse.persistence/org.eclipse.persistence.asm/9.5.0 - https://mvnrepository.com/artifact/org.eclipse.persistence/org.eclipse.persistence.core/4.0.2 - https://mvnrepository.com/artifact/org.eclipse.persistence/org.eclipse.persistence.jpa/4.0.2 - https://mvnrepository.com/artifact/org.eclipse.persistence/org.eclipse.persistence.jpa.jpql/4.0.2 ======================================================================== diff --git a/material/licenses/backend/LICENSE b/material/licenses/backend/LICENSE index 12f85ea0e7..be7c0505ed 100644 --- a/material/licenses/backend/LICENSE +++ b/material/licenses/backend/LICENSE @@ -512,11 +512,6 @@ The text of each license is also included in licenses/LICENSE-[project].txt. https://mvnrepository.com/artifact/jakarta.transaction/jakarta.transaction-api/2.0.1 https://mvnrepository.com/artifact/org.eclipse.angus/jakarta.mail/2.0.2 https://mvnrepository.com/artifact/org.aspectj/aspectjweaver/1.9.21 - https://mvnrepository.com/artifact/org.eclipse.persistence/eclipselink/4.0.2 - https://mvnrepository.com/artifact/org.eclipse.persistence/org.eclipse.persistence.asm/9.5.0 - https://mvnrepository.com/artifact/org.eclipse.persistence/org.eclipse.persistence.core/4.0.2 - https://mvnrepository.com/artifact/org.eclipse.persistence/org.eclipse.persistence.jpa/4.0.2 - https://mvnrepository.com/artifact/org.eclipse.persistence/org.eclipse.persistence.jpa.jpql/4.0.2 ======================================================================== diff --git a/material/licenses/backend/LICENSE-eclipselink.txt b/material/licenses/backend/LICENSE-eclipselink.txt deleted file mode 100644 index 3b7ae66064..0000000000 --- a/material/licenses/backend/LICENSE-eclipselink.txt +++ /dev/null @@ -1,637 +0,0 @@ -# Eclipse Public License - v 2.0 - - THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE - PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION - OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - - 1. DEFINITIONS - - "Contribution" means: - - a) in the case of the initial Contributor, the initial content - Distributed under this Agreement, and - - b) in the case of each subsequent Contributor: - i) changes to the Program, and - ii) additions to the Program; - where such changes and/or additions to the Program originate from - and are Distributed by that particular Contributor. A Contribution - "originates" from a Contributor if it was added to the Program by - such Contributor itself or anyone acting on such Contributor's behalf. - Contributions do not include changes or additions to the Program that - are not Modified Works. - - "Contributor" means any person or entity that Distributes the Program. - - "Licensed Patents" mean patent claims licensable by a Contributor which - are necessarily infringed by the use or sale of its Contribution alone - or when combined with the Program. - - "Program" means the Contributions Distributed in accordance with this - Agreement. - - "Recipient" means anyone who receives the Program under this Agreement - or any Secondary License (as applicable), including Contributors. - - "Derivative Works" shall mean any work, whether in Source Code or other - form, that is based on (or derived from) the Program and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. - - "Modified Works" shall mean any work in Source Code or other form that - results from an addition to, deletion from, or modification of the - contents of the Program, including, for purposes of clarity any new file - in Source Code form that contains any contents of the Program. Modified - Works shall not include works that contain only declarations, - interfaces, types, classes, structures, or files of the Program solely - in each case in order to link to, bind by name, or subclass the Program - or Modified Works thereof. - - "Distribute" means the acts of a) distributing or b) making available - in any manner that enables the transfer of a copy. - - "Source Code" means the form of a Program preferred for making - modifications, including but not limited to software source code, - documentation source, and configuration files. - - "Secondary License" means either the GNU General Public License, - Version 2.0, or any later versions of that license, including any - exceptions or additional permissions as identified by the initial - Contributor. - - 2. GRANT OF RIGHTS - - a) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free copyright - license to reproduce, prepare Derivative Works of, publicly display, - publicly perform, Distribute and sublicense the Contribution of such - Contributor, if any, and such Derivative Works. - - b) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free patent - license under Licensed Patents to make, use, sell, offer to sell, - import and otherwise transfer the Contribution of such Contributor, - if any, in Source Code or other form. This patent license shall - apply to the combination of the Contribution and the Program if, at - the time the Contribution is added by the Contributor, such addition - of the Contribution causes such combination to be covered by the - Licensed Patents. The patent license shall not apply to any other - combinations which include the Contribution. No hardware per se is - licensed hereunder. - - c) Recipient understands that although each Contributor grants the - licenses to its Contributions set forth herein, no assurances are - provided by any Contributor that the Program does not infringe the - patent or other intellectual property rights of any other entity. - Each Contributor disclaims any liability to Recipient for claims - brought by any other entity based on infringement of intellectual - property rights or otherwise. As a condition to exercising the - rights and licenses granted hereunder, each Recipient hereby - assumes sole responsibility to secure any other intellectual - property rights needed, if any. For example, if a third party - patent license is required to allow Recipient to Distribute the - Program, it is Recipient's responsibility to acquire that license - before distributing the Program. - - d) Each Contributor represents that to its knowledge it has - sufficient copyright rights in its Contribution, if any, to grant - the copyright license set forth in this Agreement. - - e) Notwithstanding the terms of any Secondary License, no - Contributor makes additional grants to any Recipient (other than - those set forth in this Agreement) as a result of such Recipient's - receipt of the Program under the terms of a Secondary License - (if permitted under the terms of Section 3). - - 3. REQUIREMENTS - - 3.1 If a Contributor Distributes the Program in any form, then: - - a) the Program must also be made available as Source Code, in - accordance with section 3.2, and the Contributor must accompany - the Program with a statement that the Source Code for the Program - is available under this Agreement, and informs Recipients how to - obtain it in a reasonable manner on or through a medium customarily - used for software exchange; and - - b) the Contributor may Distribute the Program under a license - different than this Agreement, provided that such license: - i) effectively disclaims on behalf of all other Contributors all - warranties and conditions, express and implied, including - warranties or conditions of title and non-infringement, and - implied warranties or conditions of merchantability and fitness - for a particular purpose; - - ii) effectively excludes on behalf of all other Contributors all - liability for damages, including direct, indirect, special, - incidental and consequential damages, such as lost profits; - - iii) does not attempt to limit or alter the recipients' rights - in the Source Code under section 3.2; and - - iv) requires any subsequent distribution of the Program by any - party to be under a license that satisfies the requirements - of this section 3. - - 3.2 When the Program is Distributed as Source Code: - - a) it must be made available under this Agreement, or if the - Program (i) is combined with other material in a separate file or - files made available under a Secondary License, and (ii) the initial - Contributor attached to the Source Code the notice described in - Exhibit A of this Agreement, then the Program may be made available - under the terms of such Secondary Licenses, and - - b) a copy of this Agreement must be included with each copy of - the Program. - - 3.3 Contributors may not remove or alter any copyright, patent, - trademark, attribution notices, disclaimers of warranty, or limitations - of liability ("notices") contained within the Program from any copy of - the Program which they Distribute, provided that Contributors may add - their own appropriate notices. - - 4. COMMERCIAL DISTRIBUTION - - Commercial distributors of software may accept certain responsibilities - with respect to end users, business partners and the like. While this - license is intended to facilitate the commercial use of the Program, - the Contributor who includes the Program in a commercial product - offering should do so in a manner which does not create potential - liability for other Contributors. Therefore, if a Contributor includes - the Program in a commercial product offering, such Contributor - ("Commercial Contributor") hereby agrees to defend and indemnify every - other Contributor ("Indemnified Contributor") against any losses, - damages and costs (collectively "Losses") arising from claims, lawsuits - and other legal actions brought by a third party against the Indemnified - Contributor to the extent caused by the acts or omissions of such - Commercial Contributor in connection with its distribution of the Program - in a commercial product offering. The obligations in this section do not - apply to any claims or Losses relating to any actual or alleged - intellectual property infringement. In order to qualify, an Indemnified - Contributor must: a) promptly notify the Commercial Contributor in - writing of such claim, and b) allow the Commercial Contributor to control, - and cooperate with the Commercial Contributor in, the defense and any - related settlement negotiations. The Indemnified Contributor may - participate in any such claim at its own expense. - - For example, a Contributor might include the Program in a commercial - product offering, Product X. That Contributor is then a Commercial - Contributor. If that Commercial Contributor then makes performance - claims, or offers warranties related to Product X, those performance - claims and warranties are such Commercial Contributor's responsibility - alone. Under this section, the Commercial Contributor would have to - defend claims against the other Contributors related to those performance - claims and warranties, and if a court requires any other Contributor to - pay any damages as a result, the Commercial Contributor must pay - those damages. - - 5. NO WARRANTY - - EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT - PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS" - BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR - IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF - TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR - PURPOSE. Each Recipient is solely responsible for determining the - appropriateness of using and distributing the Program and assumes all - risks associated with its exercise of rights under this Agreement, - including but not limited to the risks and costs of program errors, - compliance with applicable laws, damage to or loss of data, programs - or equipment, and unavailability or interruption of operations. - - 6. DISCLAIMER OF LIABILITY - - EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT - PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS - SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST - PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE - EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGES. - - 7. GENERAL - - If any provision of this Agreement is invalid or unenforceable under - applicable law, it shall not affect the validity or enforceability of - the remainder of the terms of this Agreement, and without further - action by the parties hereto, such provision shall be reformed to the - minimum extent necessary to make such provision valid and enforceable. - - If Recipient institutes patent litigation against any entity - (including a cross-claim or counterclaim in a lawsuit) alleging that the - Program itself (excluding combinations of the Program with other software - or hardware) infringes such Recipient's patent(s), then such Recipient's - rights granted under Section 2(b) shall terminate as of the date such - litigation is filed. - - All Recipient's rights under this Agreement shall terminate if it - fails to comply with any of the material terms or conditions of this - Agreement and does not cure such failure in a reasonable period of - time after becoming aware of such noncompliance. If all Recipient's - rights under this Agreement terminate, Recipient agrees to cease use - and distribution of the Program as soon as reasonably practicable. - However, Recipient's obligations under this Agreement and any licenses - granted by Recipient relating to the Program shall continue and survive. - - Everyone is permitted to copy and distribute copies of this Agreement, - but in order to avoid inconsistency the Agreement is copyrighted and - may only be modified in the following manner. The Agreement Steward - reserves the right to publish new versions (including revisions) of - this Agreement from time to time. No one other than the Agreement - Steward has the right to modify this Agreement. The Eclipse Foundation - is the initial Agreement Steward. The Eclipse Foundation may assign the - responsibility to serve as the Agreement Steward to a suitable separate - entity. Each new version of the Agreement will be given a distinguishing - version number. The Program (including Contributions) may always be - Distributed subject to the version of the Agreement under which it was - received. In addition, after a new version of the Agreement is published, - Contributor may elect to Distribute the Program (including its - Contributions) under the new version. - - Except as expressly stated in Sections 2(a) and 2(b) above, Recipient - receives no rights or licenses to the intellectual property of any - Contributor under this Agreement, whether expressly, by implication, - estoppel or otherwise. All rights in the Program not expressly granted - under this Agreement are reserved. Nothing in this Agreement is intended - to be enforceable by any entity that is not a Contributor or Recipient. - No third-party beneficiary rights are created under this Agreement. - - Exhibit A - Form of Secondary Licenses Notice - - "This Source Code may also be made available under the following - Secondary Licenses when the conditions for such availability set forth - in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), - version(s), and exceptions or additional permissions here}." - - Simply including a copy of this Agreement, including this Exhibit A - is not sufficient to license the Source Code under Secondary Licenses. - - If it is not possible or desirable to put the notice in a particular - file, then You may include the notice in a location (such as a LICENSE - file in a relevant directory) where a recipient would be likely to - look for such a notice. - - You may add additional accurate notices of copyright ownership. - ---- - -## The GNU General Public License (GPL) Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor - Boston, MA 02110-1335 - USA - - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your freedom to - share and change it. By contrast, the GNU General Public License is - intended to guarantee your freedom to share and change free software--to - make sure the software is free for all its users. This General Public - License applies to most of the Free Software Foundation's software and - to any other program whose authors commit to using it. (Some other Free - Software Foundation software is covered by the GNU Library General - Public License instead.) You can apply it to your programs, too. - - When we speak of free software, we are referring to freedom, not price. - Our General Public Licenses are designed to make sure that you have the - freedom to distribute copies of free software (and charge for this - service if you wish), that you receive source code or can get it if you - want it, that you can change the software or use pieces of it in new - free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid anyone - to deny you these rights or to ask you to surrender the rights. These - restrictions translate to certain responsibilities for you if you - distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether gratis - or for a fee, you must give the recipients all the rights that you have. - You must make sure that they, too, receive or can get the source code. - And you must show them these terms so they know their rights. - - We protect your rights with two steps: (1) copyright the software, and - (2) offer you this license which gives you legal permission to copy, - distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain - that everyone understands that there is no warranty for this free - software. If the software is modified by someone else and passed on, we - want its recipients to know that what they have is not the original, so - that any problems introduced by others will not reflect on the original - authors' reputations. - - Finally, any free program is threatened constantly by software patents. - We wish to avoid the danger that redistributors of a free program will - individually obtain patent licenses, in effect making the program - proprietary. To prevent this, we have made it clear that any patent must - be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and - modification follow. - - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains a - notice placed by the copyright holder saying it may be distributed under - the terms of this General Public License. The "Program", below, refers - to any such program or work, and a "work based on the Program" means - either the Program or any derivative work under copyright law: that is - to say, a work containing the Program or a portion of it, either - verbatim or with modifications and/or translated into another language. - (Hereinafter, translation is included without limitation in the term - "modification".) Each licensee is addressed as "you". - - Activities other than copying, distribution and modification are not - covered by this License; they are outside its scope. The act of running - the Program is not restricted, and the output from the Program is - covered only if its contents constitute a work based on the Program - (independent of having been made by running the Program). Whether that - is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's source - code as you receive it, in any medium, provided that you conspicuously - and appropriately publish on each copy an appropriate copyright notice - and disclaimer of warranty; keep intact all the notices that refer to - this License and to the absence of any warranty; and give any other - recipients of the Program a copy of this License along with the Program. - - You may charge a fee for the physical act of transferring a copy, and - you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion of - it, thus forming a work based on the Program, and copy and distribute - such modifications or work under the terms of Section 1 above, provided - that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any part - thereof, to be licensed as a whole at no charge to all third parties - under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a notice - that there is no warranty (or else, saying that you provide a - warranty) and that users may redistribute the program under these - conditions, and telling the user how to view a copy of this License. - (Exception: if the Program itself is interactive but does not - normally print such an announcement, your work based on the Program - is not required to print an announcement.) - - These requirements apply to the modified work as a whole. If - identifiable sections of that work are not derived from the Program, and - can be reasonably considered independent and separate works in - themselves, then this License, and its terms, do not apply to those - sections when you distribute them as separate works. But when you - distribute the same sections as part of a whole which is a work based on - the Program, the distribution of the whole must be on the terms of this - License, whose permissions for other licensees extend to the entire - whole, and thus to each and every part regardless of who wrote it. - - Thus, it is not the intent of this section to claim rights or contest - your rights to work written entirely by you; rather, the intent is to - exercise the right to control the distribution of derivative or - collective works based on the Program. - - In addition, mere aggregation of another work not based on the Program - with the Program (or with a work based on the Program) on a volume of a - storage or distribution medium does not bring the other work under the - scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, - under Section 2) in object code or executable form under the terms of - Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your cost - of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed - only for noncommercial distribution and only if you received the - program in object code or executable form with such an offer, in - accord with Subsection b above.) - - The source code for a work means the preferred form of the work for - making modifications to it. For an executable work, complete source code - means all the source code for all modules it contains, plus any - associated interface definition files, plus the scripts used to control - compilation and installation of the executable. However, as a special - exception, the source code distributed need not include anything that is - normally distributed (in either source or binary form) with the major - components (compiler, kernel, and so on) of the operating system on - which the executable runs, unless that component itself accompanies the - executable. - - If distribution of executable or object code is made by offering access - to copy from a designated place, then offering equivalent access to copy - the source code from the same place counts as distribution of the source - code, even though third parties are not compelled to copy the source - along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program - except as expressly provided under this License. Any attempt otherwise - to copy, modify, sublicense or distribute the Program is void, and will - automatically terminate your rights under this License. However, parties - who have received copies, or rights, from you under this License will - not have their licenses terminated so long as such parties remain in - full compliance. - - 5. You are not required to accept this License, since you have not - signed it. However, nothing else grants you permission to modify or - distribute the Program or its derivative works. These actions are - prohibited by law if you do not accept this License. Therefore, by - modifying or distributing the Program (or any work based on the - Program), you indicate your acceptance of this License to do so, and all - its terms and conditions for copying, distributing or modifying the - Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the - Program), the recipient automatically receives a license from the - original licensor to copy, distribute or modify the Program subject to - these terms and conditions. You may not impose any further restrictions - on the recipients' exercise of the rights granted herein. You are not - responsible for enforcing compliance by third parties to this License. - - 7. If, as a consequence of a court judgment or allegation of patent - infringement or for any other reason (not limited to patent issues), - conditions are imposed on you (whether by court order, agreement or - otherwise) that contradict the conditions of this License, they do not - excuse you from the conditions of this License. If you cannot distribute - so as to satisfy simultaneously your obligations under this License and - any other pertinent obligations, then as a consequence you may not - distribute the Program at all. For example, if a patent license would - not permit royalty-free redistribution of the Program by all those who - receive copies directly or indirectly through you, then the only way you - could satisfy both it and this License would be to refrain entirely from - distribution of the Program. - - If any portion of this section is held invalid or unenforceable under - any particular circumstance, the balance of the section is intended to - apply and the section as a whole is intended to apply in other - circumstances. - - It is not the purpose of this section to induce you to infringe any - patents or other property right claims or to contest validity of any - such claims; this section has the sole purpose of protecting the - integrity of the free software distribution system, which is implemented - by public license practices. Many people have made generous - contributions to the wide range of software distributed through that - system in reliance on consistent application of that system; it is up to - the author/donor to decide if he or she is willing to distribute - software through any other system and a licensee cannot impose that choice. - - This section is intended to make thoroughly clear what is believed to be - a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in - certain countries either by patents or by copyrighted interfaces, the - original copyright holder who places the Program under this License may - add an explicit geographical distribution limitation excluding those - countries, so that distribution is permitted only in or among countries - not thus excluded. In such case, this License incorporates the - limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new - versions of the 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 Program - specifies a version number of this License which applies to it and "any - later version", you have the option of following the terms and - conditions either of that version or of any later version published by - the Free Software Foundation. If the Program does not specify a version - number of this License, you may choose any version ever published by the - Free Software Foundation. - - 10. If you wish to incorporate parts of the Program into other free - programs whose distribution conditions are different, write to the - author to ask for permission. For software which is copyrighted by the - Free Software Foundation, write to the Free Software Foundation; we - sometimes make exceptions for this. Our decision will be guided by the - two goals of preserving the free status of all derivatives of our free - software and of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO - WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. - EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR - OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, - EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE - ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH - YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL - NECESSARY SERVICING, REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN - WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY - AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR - DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL - DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM - (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED - INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF - THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR - OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest - possible use to the public, the best way to achieve this is to make it - free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest to - attach them to the start of each source file to most effectively convey - the exclusion of warranty; and each file should have at least the - "copyright" line and a pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA - - Also add information on how to contact you by electronic and paper mail. - - If the program is interactive, make it output a short notice like this - when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type - `show w'. This is free software, and you are welcome to redistribute - it under certain conditions; type `show c' for details. - - The hypothetical commands `show w' and `show c' should show the - appropriate parts of the General Public License. Of course, the commands - you use may be called something other than `show w' and `show c'; they - could even be mouse-clicks or menu items--whatever suits your program. - - You should also get your employer (if you work as a programmer) or your - school, if any, to sign a "copyright disclaimer" for the program, if - necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - program `Gnomovision' (which makes passes at compilers) written by - James Hacker. - - signature of Ty Coon, 1 April 1989 - Ty Coon, President of Vice - - This General Public License does not permit incorporating your program - into proprietary programs. If your program is a subroutine library, you - may consider it more useful to permit linking proprietary applications - with the library. If this is what you want to do, use the GNU Library - General Public License instead of this License. - ---- - -## CLASSPATH EXCEPTION - - Linking this library statically or dynamically with other modules is - making a combined work based on this library. Thus, the terms and - conditions of the GNU General Public License version 2 cover the whole - combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent - modules, and to copy and distribute the resulting executable under - terms of your choice, provided that you also meet, for each linked - independent module, the terms and conditions of the license of that - module. An independent module is a module which is not derived from or - based on this library. If you modify this library, you may extend this - exception to your version of the library, but you are not obligated to - do so. If you do not wish to do so, delete this exception statement - from your version. \ No newline at end of file diff --git a/material/licenses/backend/LICENSE-org.eclipse.persistence.asm.txt b/material/licenses/backend/LICENSE-org.eclipse.persistence.asm.txt deleted file mode 100644 index 3b7ae66064..0000000000 --- a/material/licenses/backend/LICENSE-org.eclipse.persistence.asm.txt +++ /dev/null @@ -1,637 +0,0 @@ -# Eclipse Public License - v 2.0 - - THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE - PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION - OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - - 1. DEFINITIONS - - "Contribution" means: - - a) in the case of the initial Contributor, the initial content - Distributed under this Agreement, and - - b) in the case of each subsequent Contributor: - i) changes to the Program, and - ii) additions to the Program; - where such changes and/or additions to the Program originate from - and are Distributed by that particular Contributor. A Contribution - "originates" from a Contributor if it was added to the Program by - such Contributor itself or anyone acting on such Contributor's behalf. - Contributions do not include changes or additions to the Program that - are not Modified Works. - - "Contributor" means any person or entity that Distributes the Program. - - "Licensed Patents" mean patent claims licensable by a Contributor which - are necessarily infringed by the use or sale of its Contribution alone - or when combined with the Program. - - "Program" means the Contributions Distributed in accordance with this - Agreement. - - "Recipient" means anyone who receives the Program under this Agreement - or any Secondary License (as applicable), including Contributors. - - "Derivative Works" shall mean any work, whether in Source Code or other - form, that is based on (or derived from) the Program and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. - - "Modified Works" shall mean any work in Source Code or other form that - results from an addition to, deletion from, or modification of the - contents of the Program, including, for purposes of clarity any new file - in Source Code form that contains any contents of the Program. Modified - Works shall not include works that contain only declarations, - interfaces, types, classes, structures, or files of the Program solely - in each case in order to link to, bind by name, or subclass the Program - or Modified Works thereof. - - "Distribute" means the acts of a) distributing or b) making available - in any manner that enables the transfer of a copy. - - "Source Code" means the form of a Program preferred for making - modifications, including but not limited to software source code, - documentation source, and configuration files. - - "Secondary License" means either the GNU General Public License, - Version 2.0, or any later versions of that license, including any - exceptions or additional permissions as identified by the initial - Contributor. - - 2. GRANT OF RIGHTS - - a) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free copyright - license to reproduce, prepare Derivative Works of, publicly display, - publicly perform, Distribute and sublicense the Contribution of such - Contributor, if any, and such Derivative Works. - - b) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free patent - license under Licensed Patents to make, use, sell, offer to sell, - import and otherwise transfer the Contribution of such Contributor, - if any, in Source Code or other form. This patent license shall - apply to the combination of the Contribution and the Program if, at - the time the Contribution is added by the Contributor, such addition - of the Contribution causes such combination to be covered by the - Licensed Patents. The patent license shall not apply to any other - combinations which include the Contribution. No hardware per se is - licensed hereunder. - - c) Recipient understands that although each Contributor grants the - licenses to its Contributions set forth herein, no assurances are - provided by any Contributor that the Program does not infringe the - patent or other intellectual property rights of any other entity. - Each Contributor disclaims any liability to Recipient for claims - brought by any other entity based on infringement of intellectual - property rights or otherwise. As a condition to exercising the - rights and licenses granted hereunder, each Recipient hereby - assumes sole responsibility to secure any other intellectual - property rights needed, if any. For example, if a third party - patent license is required to allow Recipient to Distribute the - Program, it is Recipient's responsibility to acquire that license - before distributing the Program. - - d) Each Contributor represents that to its knowledge it has - sufficient copyright rights in its Contribution, if any, to grant - the copyright license set forth in this Agreement. - - e) Notwithstanding the terms of any Secondary License, no - Contributor makes additional grants to any Recipient (other than - those set forth in this Agreement) as a result of such Recipient's - receipt of the Program under the terms of a Secondary License - (if permitted under the terms of Section 3). - - 3. REQUIREMENTS - - 3.1 If a Contributor Distributes the Program in any form, then: - - a) the Program must also be made available as Source Code, in - accordance with section 3.2, and the Contributor must accompany - the Program with a statement that the Source Code for the Program - is available under this Agreement, and informs Recipients how to - obtain it in a reasonable manner on or through a medium customarily - used for software exchange; and - - b) the Contributor may Distribute the Program under a license - different than this Agreement, provided that such license: - i) effectively disclaims on behalf of all other Contributors all - warranties and conditions, express and implied, including - warranties or conditions of title and non-infringement, and - implied warranties or conditions of merchantability and fitness - for a particular purpose; - - ii) effectively excludes on behalf of all other Contributors all - liability for damages, including direct, indirect, special, - incidental and consequential damages, such as lost profits; - - iii) does not attempt to limit or alter the recipients' rights - in the Source Code under section 3.2; and - - iv) requires any subsequent distribution of the Program by any - party to be under a license that satisfies the requirements - of this section 3. - - 3.2 When the Program is Distributed as Source Code: - - a) it must be made available under this Agreement, or if the - Program (i) is combined with other material in a separate file or - files made available under a Secondary License, and (ii) the initial - Contributor attached to the Source Code the notice described in - Exhibit A of this Agreement, then the Program may be made available - under the terms of such Secondary Licenses, and - - b) a copy of this Agreement must be included with each copy of - the Program. - - 3.3 Contributors may not remove or alter any copyright, patent, - trademark, attribution notices, disclaimers of warranty, or limitations - of liability ("notices") contained within the Program from any copy of - the Program which they Distribute, provided that Contributors may add - their own appropriate notices. - - 4. COMMERCIAL DISTRIBUTION - - Commercial distributors of software may accept certain responsibilities - with respect to end users, business partners and the like. While this - license is intended to facilitate the commercial use of the Program, - the Contributor who includes the Program in a commercial product - offering should do so in a manner which does not create potential - liability for other Contributors. Therefore, if a Contributor includes - the Program in a commercial product offering, such Contributor - ("Commercial Contributor") hereby agrees to defend and indemnify every - other Contributor ("Indemnified Contributor") against any losses, - damages and costs (collectively "Losses") arising from claims, lawsuits - and other legal actions brought by a third party against the Indemnified - Contributor to the extent caused by the acts or omissions of such - Commercial Contributor in connection with its distribution of the Program - in a commercial product offering. The obligations in this section do not - apply to any claims or Losses relating to any actual or alleged - intellectual property infringement. In order to qualify, an Indemnified - Contributor must: a) promptly notify the Commercial Contributor in - writing of such claim, and b) allow the Commercial Contributor to control, - and cooperate with the Commercial Contributor in, the defense and any - related settlement negotiations. The Indemnified Contributor may - participate in any such claim at its own expense. - - For example, a Contributor might include the Program in a commercial - product offering, Product X. That Contributor is then a Commercial - Contributor. If that Commercial Contributor then makes performance - claims, or offers warranties related to Product X, those performance - claims and warranties are such Commercial Contributor's responsibility - alone. Under this section, the Commercial Contributor would have to - defend claims against the other Contributors related to those performance - claims and warranties, and if a court requires any other Contributor to - pay any damages as a result, the Commercial Contributor must pay - those damages. - - 5. NO WARRANTY - - EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT - PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS" - BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR - IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF - TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR - PURPOSE. Each Recipient is solely responsible for determining the - appropriateness of using and distributing the Program and assumes all - risks associated with its exercise of rights under this Agreement, - including but not limited to the risks and costs of program errors, - compliance with applicable laws, damage to or loss of data, programs - or equipment, and unavailability or interruption of operations. - - 6. DISCLAIMER OF LIABILITY - - EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT - PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS - SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST - PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE - EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGES. - - 7. GENERAL - - If any provision of this Agreement is invalid or unenforceable under - applicable law, it shall not affect the validity or enforceability of - the remainder of the terms of this Agreement, and without further - action by the parties hereto, such provision shall be reformed to the - minimum extent necessary to make such provision valid and enforceable. - - If Recipient institutes patent litigation against any entity - (including a cross-claim or counterclaim in a lawsuit) alleging that the - Program itself (excluding combinations of the Program with other software - or hardware) infringes such Recipient's patent(s), then such Recipient's - rights granted under Section 2(b) shall terminate as of the date such - litigation is filed. - - All Recipient's rights under this Agreement shall terminate if it - fails to comply with any of the material terms or conditions of this - Agreement and does not cure such failure in a reasonable period of - time after becoming aware of such noncompliance. If all Recipient's - rights under this Agreement terminate, Recipient agrees to cease use - and distribution of the Program as soon as reasonably practicable. - However, Recipient's obligations under this Agreement and any licenses - granted by Recipient relating to the Program shall continue and survive. - - Everyone is permitted to copy and distribute copies of this Agreement, - but in order to avoid inconsistency the Agreement is copyrighted and - may only be modified in the following manner. The Agreement Steward - reserves the right to publish new versions (including revisions) of - this Agreement from time to time. No one other than the Agreement - Steward has the right to modify this Agreement. The Eclipse Foundation - is the initial Agreement Steward. The Eclipse Foundation may assign the - responsibility to serve as the Agreement Steward to a suitable separate - entity. Each new version of the Agreement will be given a distinguishing - version number. The Program (including Contributions) may always be - Distributed subject to the version of the Agreement under which it was - received. In addition, after a new version of the Agreement is published, - Contributor may elect to Distribute the Program (including its - Contributions) under the new version. - - Except as expressly stated in Sections 2(a) and 2(b) above, Recipient - receives no rights or licenses to the intellectual property of any - Contributor under this Agreement, whether expressly, by implication, - estoppel or otherwise. All rights in the Program not expressly granted - under this Agreement are reserved. Nothing in this Agreement is intended - to be enforceable by any entity that is not a Contributor or Recipient. - No third-party beneficiary rights are created under this Agreement. - - Exhibit A - Form of Secondary Licenses Notice - - "This Source Code may also be made available under the following - Secondary Licenses when the conditions for such availability set forth - in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), - version(s), and exceptions or additional permissions here}." - - Simply including a copy of this Agreement, including this Exhibit A - is not sufficient to license the Source Code under Secondary Licenses. - - If it is not possible or desirable to put the notice in a particular - file, then You may include the notice in a location (such as a LICENSE - file in a relevant directory) where a recipient would be likely to - look for such a notice. - - You may add additional accurate notices of copyright ownership. - ---- - -## The GNU General Public License (GPL) Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor - Boston, MA 02110-1335 - USA - - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your freedom to - share and change it. By contrast, the GNU General Public License is - intended to guarantee your freedom to share and change free software--to - make sure the software is free for all its users. This General Public - License applies to most of the Free Software Foundation's software and - to any other program whose authors commit to using it. (Some other Free - Software Foundation software is covered by the GNU Library General - Public License instead.) You can apply it to your programs, too. - - When we speak of free software, we are referring to freedom, not price. - Our General Public Licenses are designed to make sure that you have the - freedom to distribute copies of free software (and charge for this - service if you wish), that you receive source code or can get it if you - want it, that you can change the software or use pieces of it in new - free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid anyone - to deny you these rights or to ask you to surrender the rights. These - restrictions translate to certain responsibilities for you if you - distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether gratis - or for a fee, you must give the recipients all the rights that you have. - You must make sure that they, too, receive or can get the source code. - And you must show them these terms so they know their rights. - - We protect your rights with two steps: (1) copyright the software, and - (2) offer you this license which gives you legal permission to copy, - distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain - that everyone understands that there is no warranty for this free - software. If the software is modified by someone else and passed on, we - want its recipients to know that what they have is not the original, so - that any problems introduced by others will not reflect on the original - authors' reputations. - - Finally, any free program is threatened constantly by software patents. - We wish to avoid the danger that redistributors of a free program will - individually obtain patent licenses, in effect making the program - proprietary. To prevent this, we have made it clear that any patent must - be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and - modification follow. - - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains a - notice placed by the copyright holder saying it may be distributed under - the terms of this General Public License. The "Program", below, refers - to any such program or work, and a "work based on the Program" means - either the Program or any derivative work under copyright law: that is - to say, a work containing the Program or a portion of it, either - verbatim or with modifications and/or translated into another language. - (Hereinafter, translation is included without limitation in the term - "modification".) Each licensee is addressed as "you". - - Activities other than copying, distribution and modification are not - covered by this License; they are outside its scope. The act of running - the Program is not restricted, and the output from the Program is - covered only if its contents constitute a work based on the Program - (independent of having been made by running the Program). Whether that - is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's source - code as you receive it, in any medium, provided that you conspicuously - and appropriately publish on each copy an appropriate copyright notice - and disclaimer of warranty; keep intact all the notices that refer to - this License and to the absence of any warranty; and give any other - recipients of the Program a copy of this License along with the Program. - - You may charge a fee for the physical act of transferring a copy, and - you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion of - it, thus forming a work based on the Program, and copy and distribute - such modifications or work under the terms of Section 1 above, provided - that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any part - thereof, to be licensed as a whole at no charge to all third parties - under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a notice - that there is no warranty (or else, saying that you provide a - warranty) and that users may redistribute the program under these - conditions, and telling the user how to view a copy of this License. - (Exception: if the Program itself is interactive but does not - normally print such an announcement, your work based on the Program - is not required to print an announcement.) - - These requirements apply to the modified work as a whole. If - identifiable sections of that work are not derived from the Program, and - can be reasonably considered independent and separate works in - themselves, then this License, and its terms, do not apply to those - sections when you distribute them as separate works. But when you - distribute the same sections as part of a whole which is a work based on - the Program, the distribution of the whole must be on the terms of this - License, whose permissions for other licensees extend to the entire - whole, and thus to each and every part regardless of who wrote it. - - Thus, it is not the intent of this section to claim rights or contest - your rights to work written entirely by you; rather, the intent is to - exercise the right to control the distribution of derivative or - collective works based on the Program. - - In addition, mere aggregation of another work not based on the Program - with the Program (or with a work based on the Program) on a volume of a - storage or distribution medium does not bring the other work under the - scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, - under Section 2) in object code or executable form under the terms of - Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your cost - of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed - only for noncommercial distribution and only if you received the - program in object code or executable form with such an offer, in - accord with Subsection b above.) - - The source code for a work means the preferred form of the work for - making modifications to it. For an executable work, complete source code - means all the source code for all modules it contains, plus any - associated interface definition files, plus the scripts used to control - compilation and installation of the executable. However, as a special - exception, the source code distributed need not include anything that is - normally distributed (in either source or binary form) with the major - components (compiler, kernel, and so on) of the operating system on - which the executable runs, unless that component itself accompanies the - executable. - - If distribution of executable or object code is made by offering access - to copy from a designated place, then offering equivalent access to copy - the source code from the same place counts as distribution of the source - code, even though third parties are not compelled to copy the source - along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program - except as expressly provided under this License. Any attempt otherwise - to copy, modify, sublicense or distribute the Program is void, and will - automatically terminate your rights under this License. However, parties - who have received copies, or rights, from you under this License will - not have their licenses terminated so long as such parties remain in - full compliance. - - 5. You are not required to accept this License, since you have not - signed it. However, nothing else grants you permission to modify or - distribute the Program or its derivative works. These actions are - prohibited by law if you do not accept this License. Therefore, by - modifying or distributing the Program (or any work based on the - Program), you indicate your acceptance of this License to do so, and all - its terms and conditions for copying, distributing or modifying the - Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the - Program), the recipient automatically receives a license from the - original licensor to copy, distribute or modify the Program subject to - these terms and conditions. You may not impose any further restrictions - on the recipients' exercise of the rights granted herein. You are not - responsible for enforcing compliance by third parties to this License. - - 7. If, as a consequence of a court judgment or allegation of patent - infringement or for any other reason (not limited to patent issues), - conditions are imposed on you (whether by court order, agreement or - otherwise) that contradict the conditions of this License, they do not - excuse you from the conditions of this License. If you cannot distribute - so as to satisfy simultaneously your obligations under this License and - any other pertinent obligations, then as a consequence you may not - distribute the Program at all. For example, if a patent license would - not permit royalty-free redistribution of the Program by all those who - receive copies directly or indirectly through you, then the only way you - could satisfy both it and this License would be to refrain entirely from - distribution of the Program. - - If any portion of this section is held invalid or unenforceable under - any particular circumstance, the balance of the section is intended to - apply and the section as a whole is intended to apply in other - circumstances. - - It is not the purpose of this section to induce you to infringe any - patents or other property right claims or to contest validity of any - such claims; this section has the sole purpose of protecting the - integrity of the free software distribution system, which is implemented - by public license practices. Many people have made generous - contributions to the wide range of software distributed through that - system in reliance on consistent application of that system; it is up to - the author/donor to decide if he or she is willing to distribute - software through any other system and a licensee cannot impose that choice. - - This section is intended to make thoroughly clear what is believed to be - a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in - certain countries either by patents or by copyrighted interfaces, the - original copyright holder who places the Program under this License may - add an explicit geographical distribution limitation excluding those - countries, so that distribution is permitted only in or among countries - not thus excluded. In such case, this License incorporates the - limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new - versions of the 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 Program - specifies a version number of this License which applies to it and "any - later version", you have the option of following the terms and - conditions either of that version or of any later version published by - the Free Software Foundation. If the Program does not specify a version - number of this License, you may choose any version ever published by the - Free Software Foundation. - - 10. If you wish to incorporate parts of the Program into other free - programs whose distribution conditions are different, write to the - author to ask for permission. For software which is copyrighted by the - Free Software Foundation, write to the Free Software Foundation; we - sometimes make exceptions for this. Our decision will be guided by the - two goals of preserving the free status of all derivatives of our free - software and of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO - WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. - EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR - OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, - EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE - ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH - YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL - NECESSARY SERVICING, REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN - WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY - AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR - DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL - DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM - (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED - INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF - THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR - OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest - possible use to the public, the best way to achieve this is to make it - free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest to - attach them to the start of each source file to most effectively convey - the exclusion of warranty; and each file should have at least the - "copyright" line and a pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA - - Also add information on how to contact you by electronic and paper mail. - - If the program is interactive, make it output a short notice like this - when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type - `show w'. This is free software, and you are welcome to redistribute - it under certain conditions; type `show c' for details. - - The hypothetical commands `show w' and `show c' should show the - appropriate parts of the General Public License. Of course, the commands - you use may be called something other than `show w' and `show c'; they - could even be mouse-clicks or menu items--whatever suits your program. - - You should also get your employer (if you work as a programmer) or your - school, if any, to sign a "copyright disclaimer" for the program, if - necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - program `Gnomovision' (which makes passes at compilers) written by - James Hacker. - - signature of Ty Coon, 1 April 1989 - Ty Coon, President of Vice - - This General Public License does not permit incorporating your program - into proprietary programs. If your program is a subroutine library, you - may consider it more useful to permit linking proprietary applications - with the library. If this is what you want to do, use the GNU Library - General Public License instead of this License. - ---- - -## CLASSPATH EXCEPTION - - Linking this library statically or dynamically with other modules is - making a combined work based on this library. Thus, the terms and - conditions of the GNU General Public License version 2 cover the whole - combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent - modules, and to copy and distribute the resulting executable under - terms of your choice, provided that you also meet, for each linked - independent module, the terms and conditions of the license of that - module. An independent module is a module which is not derived from or - based on this library. If you modify this library, you may extend this - exception to your version of the library, but you are not obligated to - do so. If you do not wish to do so, delete this exception statement - from your version. \ No newline at end of file diff --git a/material/licenses/backend/LICENSE-org.eclipse.persistence.core.txt b/material/licenses/backend/LICENSE-org.eclipse.persistence.core.txt deleted file mode 100644 index 3b7ae66064..0000000000 --- a/material/licenses/backend/LICENSE-org.eclipse.persistence.core.txt +++ /dev/null @@ -1,637 +0,0 @@ -# Eclipse Public License - v 2.0 - - THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE - PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION - OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - - 1. DEFINITIONS - - "Contribution" means: - - a) in the case of the initial Contributor, the initial content - Distributed under this Agreement, and - - b) in the case of each subsequent Contributor: - i) changes to the Program, and - ii) additions to the Program; - where such changes and/or additions to the Program originate from - and are Distributed by that particular Contributor. A Contribution - "originates" from a Contributor if it was added to the Program by - such Contributor itself or anyone acting on such Contributor's behalf. - Contributions do not include changes or additions to the Program that - are not Modified Works. - - "Contributor" means any person or entity that Distributes the Program. - - "Licensed Patents" mean patent claims licensable by a Contributor which - are necessarily infringed by the use or sale of its Contribution alone - or when combined with the Program. - - "Program" means the Contributions Distributed in accordance with this - Agreement. - - "Recipient" means anyone who receives the Program under this Agreement - or any Secondary License (as applicable), including Contributors. - - "Derivative Works" shall mean any work, whether in Source Code or other - form, that is based on (or derived from) the Program and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. - - "Modified Works" shall mean any work in Source Code or other form that - results from an addition to, deletion from, or modification of the - contents of the Program, including, for purposes of clarity any new file - in Source Code form that contains any contents of the Program. Modified - Works shall not include works that contain only declarations, - interfaces, types, classes, structures, or files of the Program solely - in each case in order to link to, bind by name, or subclass the Program - or Modified Works thereof. - - "Distribute" means the acts of a) distributing or b) making available - in any manner that enables the transfer of a copy. - - "Source Code" means the form of a Program preferred for making - modifications, including but not limited to software source code, - documentation source, and configuration files. - - "Secondary License" means either the GNU General Public License, - Version 2.0, or any later versions of that license, including any - exceptions or additional permissions as identified by the initial - Contributor. - - 2. GRANT OF RIGHTS - - a) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free copyright - license to reproduce, prepare Derivative Works of, publicly display, - publicly perform, Distribute and sublicense the Contribution of such - Contributor, if any, and such Derivative Works. - - b) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free patent - license under Licensed Patents to make, use, sell, offer to sell, - import and otherwise transfer the Contribution of such Contributor, - if any, in Source Code or other form. This patent license shall - apply to the combination of the Contribution and the Program if, at - the time the Contribution is added by the Contributor, such addition - of the Contribution causes such combination to be covered by the - Licensed Patents. The patent license shall not apply to any other - combinations which include the Contribution. No hardware per se is - licensed hereunder. - - c) Recipient understands that although each Contributor grants the - licenses to its Contributions set forth herein, no assurances are - provided by any Contributor that the Program does not infringe the - patent or other intellectual property rights of any other entity. - Each Contributor disclaims any liability to Recipient for claims - brought by any other entity based on infringement of intellectual - property rights or otherwise. As a condition to exercising the - rights and licenses granted hereunder, each Recipient hereby - assumes sole responsibility to secure any other intellectual - property rights needed, if any. For example, if a third party - patent license is required to allow Recipient to Distribute the - Program, it is Recipient's responsibility to acquire that license - before distributing the Program. - - d) Each Contributor represents that to its knowledge it has - sufficient copyright rights in its Contribution, if any, to grant - the copyright license set forth in this Agreement. - - e) Notwithstanding the terms of any Secondary License, no - Contributor makes additional grants to any Recipient (other than - those set forth in this Agreement) as a result of such Recipient's - receipt of the Program under the terms of a Secondary License - (if permitted under the terms of Section 3). - - 3. REQUIREMENTS - - 3.1 If a Contributor Distributes the Program in any form, then: - - a) the Program must also be made available as Source Code, in - accordance with section 3.2, and the Contributor must accompany - the Program with a statement that the Source Code for the Program - is available under this Agreement, and informs Recipients how to - obtain it in a reasonable manner on or through a medium customarily - used for software exchange; and - - b) the Contributor may Distribute the Program under a license - different than this Agreement, provided that such license: - i) effectively disclaims on behalf of all other Contributors all - warranties and conditions, express and implied, including - warranties or conditions of title and non-infringement, and - implied warranties or conditions of merchantability and fitness - for a particular purpose; - - ii) effectively excludes on behalf of all other Contributors all - liability for damages, including direct, indirect, special, - incidental and consequential damages, such as lost profits; - - iii) does not attempt to limit or alter the recipients' rights - in the Source Code under section 3.2; and - - iv) requires any subsequent distribution of the Program by any - party to be under a license that satisfies the requirements - of this section 3. - - 3.2 When the Program is Distributed as Source Code: - - a) it must be made available under this Agreement, or if the - Program (i) is combined with other material in a separate file or - files made available under a Secondary License, and (ii) the initial - Contributor attached to the Source Code the notice described in - Exhibit A of this Agreement, then the Program may be made available - under the terms of such Secondary Licenses, and - - b) a copy of this Agreement must be included with each copy of - the Program. - - 3.3 Contributors may not remove or alter any copyright, patent, - trademark, attribution notices, disclaimers of warranty, or limitations - of liability ("notices") contained within the Program from any copy of - the Program which they Distribute, provided that Contributors may add - their own appropriate notices. - - 4. COMMERCIAL DISTRIBUTION - - Commercial distributors of software may accept certain responsibilities - with respect to end users, business partners and the like. While this - license is intended to facilitate the commercial use of the Program, - the Contributor who includes the Program in a commercial product - offering should do so in a manner which does not create potential - liability for other Contributors. Therefore, if a Contributor includes - the Program in a commercial product offering, such Contributor - ("Commercial Contributor") hereby agrees to defend and indemnify every - other Contributor ("Indemnified Contributor") against any losses, - damages and costs (collectively "Losses") arising from claims, lawsuits - and other legal actions brought by a third party against the Indemnified - Contributor to the extent caused by the acts or omissions of such - Commercial Contributor in connection with its distribution of the Program - in a commercial product offering. The obligations in this section do not - apply to any claims or Losses relating to any actual or alleged - intellectual property infringement. In order to qualify, an Indemnified - Contributor must: a) promptly notify the Commercial Contributor in - writing of such claim, and b) allow the Commercial Contributor to control, - and cooperate with the Commercial Contributor in, the defense and any - related settlement negotiations. The Indemnified Contributor may - participate in any such claim at its own expense. - - For example, a Contributor might include the Program in a commercial - product offering, Product X. That Contributor is then a Commercial - Contributor. If that Commercial Contributor then makes performance - claims, or offers warranties related to Product X, those performance - claims and warranties are such Commercial Contributor's responsibility - alone. Under this section, the Commercial Contributor would have to - defend claims against the other Contributors related to those performance - claims and warranties, and if a court requires any other Contributor to - pay any damages as a result, the Commercial Contributor must pay - those damages. - - 5. NO WARRANTY - - EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT - PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS" - BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR - IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF - TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR - PURPOSE. Each Recipient is solely responsible for determining the - appropriateness of using and distributing the Program and assumes all - risks associated with its exercise of rights under this Agreement, - including but not limited to the risks and costs of program errors, - compliance with applicable laws, damage to or loss of data, programs - or equipment, and unavailability or interruption of operations. - - 6. DISCLAIMER OF LIABILITY - - EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT - PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS - SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST - PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE - EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGES. - - 7. GENERAL - - If any provision of this Agreement is invalid or unenforceable under - applicable law, it shall not affect the validity or enforceability of - the remainder of the terms of this Agreement, and without further - action by the parties hereto, such provision shall be reformed to the - minimum extent necessary to make such provision valid and enforceable. - - If Recipient institutes patent litigation against any entity - (including a cross-claim or counterclaim in a lawsuit) alleging that the - Program itself (excluding combinations of the Program with other software - or hardware) infringes such Recipient's patent(s), then such Recipient's - rights granted under Section 2(b) shall terminate as of the date such - litigation is filed. - - All Recipient's rights under this Agreement shall terminate if it - fails to comply with any of the material terms or conditions of this - Agreement and does not cure such failure in a reasonable period of - time after becoming aware of such noncompliance. If all Recipient's - rights under this Agreement terminate, Recipient agrees to cease use - and distribution of the Program as soon as reasonably practicable. - However, Recipient's obligations under this Agreement and any licenses - granted by Recipient relating to the Program shall continue and survive. - - Everyone is permitted to copy and distribute copies of this Agreement, - but in order to avoid inconsistency the Agreement is copyrighted and - may only be modified in the following manner. The Agreement Steward - reserves the right to publish new versions (including revisions) of - this Agreement from time to time. No one other than the Agreement - Steward has the right to modify this Agreement. The Eclipse Foundation - is the initial Agreement Steward. The Eclipse Foundation may assign the - responsibility to serve as the Agreement Steward to a suitable separate - entity. Each new version of the Agreement will be given a distinguishing - version number. The Program (including Contributions) may always be - Distributed subject to the version of the Agreement under which it was - received. In addition, after a new version of the Agreement is published, - Contributor may elect to Distribute the Program (including its - Contributions) under the new version. - - Except as expressly stated in Sections 2(a) and 2(b) above, Recipient - receives no rights or licenses to the intellectual property of any - Contributor under this Agreement, whether expressly, by implication, - estoppel or otherwise. All rights in the Program not expressly granted - under this Agreement are reserved. Nothing in this Agreement is intended - to be enforceable by any entity that is not a Contributor or Recipient. - No third-party beneficiary rights are created under this Agreement. - - Exhibit A - Form of Secondary Licenses Notice - - "This Source Code may also be made available under the following - Secondary Licenses when the conditions for such availability set forth - in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), - version(s), and exceptions or additional permissions here}." - - Simply including a copy of this Agreement, including this Exhibit A - is not sufficient to license the Source Code under Secondary Licenses. - - If it is not possible or desirable to put the notice in a particular - file, then You may include the notice in a location (such as a LICENSE - file in a relevant directory) where a recipient would be likely to - look for such a notice. - - You may add additional accurate notices of copyright ownership. - ---- - -## The GNU General Public License (GPL) Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor - Boston, MA 02110-1335 - USA - - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your freedom to - share and change it. By contrast, the GNU General Public License is - intended to guarantee your freedom to share and change free software--to - make sure the software is free for all its users. This General Public - License applies to most of the Free Software Foundation's software and - to any other program whose authors commit to using it. (Some other Free - Software Foundation software is covered by the GNU Library General - Public License instead.) You can apply it to your programs, too. - - When we speak of free software, we are referring to freedom, not price. - Our General Public Licenses are designed to make sure that you have the - freedom to distribute copies of free software (and charge for this - service if you wish), that you receive source code or can get it if you - want it, that you can change the software or use pieces of it in new - free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid anyone - to deny you these rights or to ask you to surrender the rights. These - restrictions translate to certain responsibilities for you if you - distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether gratis - or for a fee, you must give the recipients all the rights that you have. - You must make sure that they, too, receive or can get the source code. - And you must show them these terms so they know their rights. - - We protect your rights with two steps: (1) copyright the software, and - (2) offer you this license which gives you legal permission to copy, - distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain - that everyone understands that there is no warranty for this free - software. If the software is modified by someone else and passed on, we - want its recipients to know that what they have is not the original, so - that any problems introduced by others will not reflect on the original - authors' reputations. - - Finally, any free program is threatened constantly by software patents. - We wish to avoid the danger that redistributors of a free program will - individually obtain patent licenses, in effect making the program - proprietary. To prevent this, we have made it clear that any patent must - be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and - modification follow. - - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains a - notice placed by the copyright holder saying it may be distributed under - the terms of this General Public License. The "Program", below, refers - to any such program or work, and a "work based on the Program" means - either the Program or any derivative work under copyright law: that is - to say, a work containing the Program or a portion of it, either - verbatim or with modifications and/or translated into another language. - (Hereinafter, translation is included without limitation in the term - "modification".) Each licensee is addressed as "you". - - Activities other than copying, distribution and modification are not - covered by this License; they are outside its scope. The act of running - the Program is not restricted, and the output from the Program is - covered only if its contents constitute a work based on the Program - (independent of having been made by running the Program). Whether that - is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's source - code as you receive it, in any medium, provided that you conspicuously - and appropriately publish on each copy an appropriate copyright notice - and disclaimer of warranty; keep intact all the notices that refer to - this License and to the absence of any warranty; and give any other - recipients of the Program a copy of this License along with the Program. - - You may charge a fee for the physical act of transferring a copy, and - you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion of - it, thus forming a work based on the Program, and copy and distribute - such modifications or work under the terms of Section 1 above, provided - that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any part - thereof, to be licensed as a whole at no charge to all third parties - under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a notice - that there is no warranty (or else, saying that you provide a - warranty) and that users may redistribute the program under these - conditions, and telling the user how to view a copy of this License. - (Exception: if the Program itself is interactive but does not - normally print such an announcement, your work based on the Program - is not required to print an announcement.) - - These requirements apply to the modified work as a whole. If - identifiable sections of that work are not derived from the Program, and - can be reasonably considered independent and separate works in - themselves, then this License, and its terms, do not apply to those - sections when you distribute them as separate works. But when you - distribute the same sections as part of a whole which is a work based on - the Program, the distribution of the whole must be on the terms of this - License, whose permissions for other licensees extend to the entire - whole, and thus to each and every part regardless of who wrote it. - - Thus, it is not the intent of this section to claim rights or contest - your rights to work written entirely by you; rather, the intent is to - exercise the right to control the distribution of derivative or - collective works based on the Program. - - In addition, mere aggregation of another work not based on the Program - with the Program (or with a work based on the Program) on a volume of a - storage or distribution medium does not bring the other work under the - scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, - under Section 2) in object code or executable form under the terms of - Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your cost - of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed - only for noncommercial distribution and only if you received the - program in object code or executable form with such an offer, in - accord with Subsection b above.) - - The source code for a work means the preferred form of the work for - making modifications to it. For an executable work, complete source code - means all the source code for all modules it contains, plus any - associated interface definition files, plus the scripts used to control - compilation and installation of the executable. However, as a special - exception, the source code distributed need not include anything that is - normally distributed (in either source or binary form) with the major - components (compiler, kernel, and so on) of the operating system on - which the executable runs, unless that component itself accompanies the - executable. - - If distribution of executable or object code is made by offering access - to copy from a designated place, then offering equivalent access to copy - the source code from the same place counts as distribution of the source - code, even though third parties are not compelled to copy the source - along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program - except as expressly provided under this License. Any attempt otherwise - to copy, modify, sublicense or distribute the Program is void, and will - automatically terminate your rights under this License. However, parties - who have received copies, or rights, from you under this License will - not have their licenses terminated so long as such parties remain in - full compliance. - - 5. You are not required to accept this License, since you have not - signed it. However, nothing else grants you permission to modify or - distribute the Program or its derivative works. These actions are - prohibited by law if you do not accept this License. Therefore, by - modifying or distributing the Program (or any work based on the - Program), you indicate your acceptance of this License to do so, and all - its terms and conditions for copying, distributing or modifying the - Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the - Program), the recipient automatically receives a license from the - original licensor to copy, distribute or modify the Program subject to - these terms and conditions. You may not impose any further restrictions - on the recipients' exercise of the rights granted herein. You are not - responsible for enforcing compliance by third parties to this License. - - 7. If, as a consequence of a court judgment or allegation of patent - infringement or for any other reason (not limited to patent issues), - conditions are imposed on you (whether by court order, agreement or - otherwise) that contradict the conditions of this License, they do not - excuse you from the conditions of this License. If you cannot distribute - so as to satisfy simultaneously your obligations under this License and - any other pertinent obligations, then as a consequence you may not - distribute the Program at all. For example, if a patent license would - not permit royalty-free redistribution of the Program by all those who - receive copies directly or indirectly through you, then the only way you - could satisfy both it and this License would be to refrain entirely from - distribution of the Program. - - If any portion of this section is held invalid or unenforceable under - any particular circumstance, the balance of the section is intended to - apply and the section as a whole is intended to apply in other - circumstances. - - It is not the purpose of this section to induce you to infringe any - patents or other property right claims or to contest validity of any - such claims; this section has the sole purpose of protecting the - integrity of the free software distribution system, which is implemented - by public license practices. Many people have made generous - contributions to the wide range of software distributed through that - system in reliance on consistent application of that system; it is up to - the author/donor to decide if he or she is willing to distribute - software through any other system and a licensee cannot impose that choice. - - This section is intended to make thoroughly clear what is believed to be - a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in - certain countries either by patents or by copyrighted interfaces, the - original copyright holder who places the Program under this License may - add an explicit geographical distribution limitation excluding those - countries, so that distribution is permitted only in or among countries - not thus excluded. In such case, this License incorporates the - limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new - versions of the 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 Program - specifies a version number of this License which applies to it and "any - later version", you have the option of following the terms and - conditions either of that version or of any later version published by - the Free Software Foundation. If the Program does not specify a version - number of this License, you may choose any version ever published by the - Free Software Foundation. - - 10. If you wish to incorporate parts of the Program into other free - programs whose distribution conditions are different, write to the - author to ask for permission. For software which is copyrighted by the - Free Software Foundation, write to the Free Software Foundation; we - sometimes make exceptions for this. Our decision will be guided by the - two goals of preserving the free status of all derivatives of our free - software and of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO - WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. - EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR - OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, - EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE - ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH - YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL - NECESSARY SERVICING, REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN - WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY - AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR - DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL - DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM - (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED - INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF - THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR - OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest - possible use to the public, the best way to achieve this is to make it - free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest to - attach them to the start of each source file to most effectively convey - the exclusion of warranty; and each file should have at least the - "copyright" line and a pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA - - Also add information on how to contact you by electronic and paper mail. - - If the program is interactive, make it output a short notice like this - when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type - `show w'. This is free software, and you are welcome to redistribute - it under certain conditions; type `show c' for details. - - The hypothetical commands `show w' and `show c' should show the - appropriate parts of the General Public License. Of course, the commands - you use may be called something other than `show w' and `show c'; they - could even be mouse-clicks or menu items--whatever suits your program. - - You should also get your employer (if you work as a programmer) or your - school, if any, to sign a "copyright disclaimer" for the program, if - necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - program `Gnomovision' (which makes passes at compilers) written by - James Hacker. - - signature of Ty Coon, 1 April 1989 - Ty Coon, President of Vice - - This General Public License does not permit incorporating your program - into proprietary programs. If your program is a subroutine library, you - may consider it more useful to permit linking proprietary applications - with the library. If this is what you want to do, use the GNU Library - General Public License instead of this License. - ---- - -## CLASSPATH EXCEPTION - - Linking this library statically or dynamically with other modules is - making a combined work based on this library. Thus, the terms and - conditions of the GNU General Public License version 2 cover the whole - combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent - modules, and to copy and distribute the resulting executable under - terms of your choice, provided that you also meet, for each linked - independent module, the terms and conditions of the license of that - module. An independent module is a module which is not derived from or - based on this library. If you modify this library, you may extend this - exception to your version of the library, but you are not obligated to - do so. If you do not wish to do so, delete this exception statement - from your version. \ No newline at end of file diff --git a/material/licenses/backend/LICENSE-org.eclipse.persistence.jpa.txt b/material/licenses/backend/LICENSE-org.eclipse.persistence.jpa.txt deleted file mode 100644 index 3b7ae66064..0000000000 --- a/material/licenses/backend/LICENSE-org.eclipse.persistence.jpa.txt +++ /dev/null @@ -1,637 +0,0 @@ -# Eclipse Public License - v 2.0 - - THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE - PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION - OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - - 1. DEFINITIONS - - "Contribution" means: - - a) in the case of the initial Contributor, the initial content - Distributed under this Agreement, and - - b) in the case of each subsequent Contributor: - i) changes to the Program, and - ii) additions to the Program; - where such changes and/or additions to the Program originate from - and are Distributed by that particular Contributor. A Contribution - "originates" from a Contributor if it was added to the Program by - such Contributor itself or anyone acting on such Contributor's behalf. - Contributions do not include changes or additions to the Program that - are not Modified Works. - - "Contributor" means any person or entity that Distributes the Program. - - "Licensed Patents" mean patent claims licensable by a Contributor which - are necessarily infringed by the use or sale of its Contribution alone - or when combined with the Program. - - "Program" means the Contributions Distributed in accordance with this - Agreement. - - "Recipient" means anyone who receives the Program under this Agreement - or any Secondary License (as applicable), including Contributors. - - "Derivative Works" shall mean any work, whether in Source Code or other - form, that is based on (or derived from) the Program and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. - - "Modified Works" shall mean any work in Source Code or other form that - results from an addition to, deletion from, or modification of the - contents of the Program, including, for purposes of clarity any new file - in Source Code form that contains any contents of the Program. Modified - Works shall not include works that contain only declarations, - interfaces, types, classes, structures, or files of the Program solely - in each case in order to link to, bind by name, or subclass the Program - or Modified Works thereof. - - "Distribute" means the acts of a) distributing or b) making available - in any manner that enables the transfer of a copy. - - "Source Code" means the form of a Program preferred for making - modifications, including but not limited to software source code, - documentation source, and configuration files. - - "Secondary License" means either the GNU General Public License, - Version 2.0, or any later versions of that license, including any - exceptions or additional permissions as identified by the initial - Contributor. - - 2. GRANT OF RIGHTS - - a) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free copyright - license to reproduce, prepare Derivative Works of, publicly display, - publicly perform, Distribute and sublicense the Contribution of such - Contributor, if any, and such Derivative Works. - - b) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free patent - license under Licensed Patents to make, use, sell, offer to sell, - import and otherwise transfer the Contribution of such Contributor, - if any, in Source Code or other form. This patent license shall - apply to the combination of the Contribution and the Program if, at - the time the Contribution is added by the Contributor, such addition - of the Contribution causes such combination to be covered by the - Licensed Patents. The patent license shall not apply to any other - combinations which include the Contribution. No hardware per se is - licensed hereunder. - - c) Recipient understands that although each Contributor grants the - licenses to its Contributions set forth herein, no assurances are - provided by any Contributor that the Program does not infringe the - patent or other intellectual property rights of any other entity. - Each Contributor disclaims any liability to Recipient for claims - brought by any other entity based on infringement of intellectual - property rights or otherwise. As a condition to exercising the - rights and licenses granted hereunder, each Recipient hereby - assumes sole responsibility to secure any other intellectual - property rights needed, if any. For example, if a third party - patent license is required to allow Recipient to Distribute the - Program, it is Recipient's responsibility to acquire that license - before distributing the Program. - - d) Each Contributor represents that to its knowledge it has - sufficient copyright rights in its Contribution, if any, to grant - the copyright license set forth in this Agreement. - - e) Notwithstanding the terms of any Secondary License, no - Contributor makes additional grants to any Recipient (other than - those set forth in this Agreement) as a result of such Recipient's - receipt of the Program under the terms of a Secondary License - (if permitted under the terms of Section 3). - - 3. REQUIREMENTS - - 3.1 If a Contributor Distributes the Program in any form, then: - - a) the Program must also be made available as Source Code, in - accordance with section 3.2, and the Contributor must accompany - the Program with a statement that the Source Code for the Program - is available under this Agreement, and informs Recipients how to - obtain it in a reasonable manner on or through a medium customarily - used for software exchange; and - - b) the Contributor may Distribute the Program under a license - different than this Agreement, provided that such license: - i) effectively disclaims on behalf of all other Contributors all - warranties and conditions, express and implied, including - warranties or conditions of title and non-infringement, and - implied warranties or conditions of merchantability and fitness - for a particular purpose; - - ii) effectively excludes on behalf of all other Contributors all - liability for damages, including direct, indirect, special, - incidental and consequential damages, such as lost profits; - - iii) does not attempt to limit or alter the recipients' rights - in the Source Code under section 3.2; and - - iv) requires any subsequent distribution of the Program by any - party to be under a license that satisfies the requirements - of this section 3. - - 3.2 When the Program is Distributed as Source Code: - - a) it must be made available under this Agreement, or if the - Program (i) is combined with other material in a separate file or - files made available under a Secondary License, and (ii) the initial - Contributor attached to the Source Code the notice described in - Exhibit A of this Agreement, then the Program may be made available - under the terms of such Secondary Licenses, and - - b) a copy of this Agreement must be included with each copy of - the Program. - - 3.3 Contributors may not remove or alter any copyright, patent, - trademark, attribution notices, disclaimers of warranty, or limitations - of liability ("notices") contained within the Program from any copy of - the Program which they Distribute, provided that Contributors may add - their own appropriate notices. - - 4. COMMERCIAL DISTRIBUTION - - Commercial distributors of software may accept certain responsibilities - with respect to end users, business partners and the like. While this - license is intended to facilitate the commercial use of the Program, - the Contributor who includes the Program in a commercial product - offering should do so in a manner which does not create potential - liability for other Contributors. Therefore, if a Contributor includes - the Program in a commercial product offering, such Contributor - ("Commercial Contributor") hereby agrees to defend and indemnify every - other Contributor ("Indemnified Contributor") against any losses, - damages and costs (collectively "Losses") arising from claims, lawsuits - and other legal actions brought by a third party against the Indemnified - Contributor to the extent caused by the acts or omissions of such - Commercial Contributor in connection with its distribution of the Program - in a commercial product offering. The obligations in this section do not - apply to any claims or Losses relating to any actual or alleged - intellectual property infringement. In order to qualify, an Indemnified - Contributor must: a) promptly notify the Commercial Contributor in - writing of such claim, and b) allow the Commercial Contributor to control, - and cooperate with the Commercial Contributor in, the defense and any - related settlement negotiations. The Indemnified Contributor may - participate in any such claim at its own expense. - - For example, a Contributor might include the Program in a commercial - product offering, Product X. That Contributor is then a Commercial - Contributor. If that Commercial Contributor then makes performance - claims, or offers warranties related to Product X, those performance - claims and warranties are such Commercial Contributor's responsibility - alone. Under this section, the Commercial Contributor would have to - defend claims against the other Contributors related to those performance - claims and warranties, and if a court requires any other Contributor to - pay any damages as a result, the Commercial Contributor must pay - those damages. - - 5. NO WARRANTY - - EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT - PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS" - BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR - IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF - TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR - PURPOSE. Each Recipient is solely responsible for determining the - appropriateness of using and distributing the Program and assumes all - risks associated with its exercise of rights under this Agreement, - including but not limited to the risks and costs of program errors, - compliance with applicable laws, damage to or loss of data, programs - or equipment, and unavailability or interruption of operations. - - 6. DISCLAIMER OF LIABILITY - - EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT - PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS - SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST - PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE - EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGES. - - 7. GENERAL - - If any provision of this Agreement is invalid or unenforceable under - applicable law, it shall not affect the validity or enforceability of - the remainder of the terms of this Agreement, and without further - action by the parties hereto, such provision shall be reformed to the - minimum extent necessary to make such provision valid and enforceable. - - If Recipient institutes patent litigation against any entity - (including a cross-claim or counterclaim in a lawsuit) alleging that the - Program itself (excluding combinations of the Program with other software - or hardware) infringes such Recipient's patent(s), then such Recipient's - rights granted under Section 2(b) shall terminate as of the date such - litigation is filed. - - All Recipient's rights under this Agreement shall terminate if it - fails to comply with any of the material terms or conditions of this - Agreement and does not cure such failure in a reasonable period of - time after becoming aware of such noncompliance. If all Recipient's - rights under this Agreement terminate, Recipient agrees to cease use - and distribution of the Program as soon as reasonably practicable. - However, Recipient's obligations under this Agreement and any licenses - granted by Recipient relating to the Program shall continue and survive. - - Everyone is permitted to copy and distribute copies of this Agreement, - but in order to avoid inconsistency the Agreement is copyrighted and - may only be modified in the following manner. The Agreement Steward - reserves the right to publish new versions (including revisions) of - this Agreement from time to time. No one other than the Agreement - Steward has the right to modify this Agreement. The Eclipse Foundation - is the initial Agreement Steward. The Eclipse Foundation may assign the - responsibility to serve as the Agreement Steward to a suitable separate - entity. Each new version of the Agreement will be given a distinguishing - version number. The Program (including Contributions) may always be - Distributed subject to the version of the Agreement under which it was - received. In addition, after a new version of the Agreement is published, - Contributor may elect to Distribute the Program (including its - Contributions) under the new version. - - Except as expressly stated in Sections 2(a) and 2(b) above, Recipient - receives no rights or licenses to the intellectual property of any - Contributor under this Agreement, whether expressly, by implication, - estoppel or otherwise. All rights in the Program not expressly granted - under this Agreement are reserved. Nothing in this Agreement is intended - to be enforceable by any entity that is not a Contributor or Recipient. - No third-party beneficiary rights are created under this Agreement. - - Exhibit A - Form of Secondary Licenses Notice - - "This Source Code may also be made available under the following - Secondary Licenses when the conditions for such availability set forth - in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), - version(s), and exceptions or additional permissions here}." - - Simply including a copy of this Agreement, including this Exhibit A - is not sufficient to license the Source Code under Secondary Licenses. - - If it is not possible or desirable to put the notice in a particular - file, then You may include the notice in a location (such as a LICENSE - file in a relevant directory) where a recipient would be likely to - look for such a notice. - - You may add additional accurate notices of copyright ownership. - ---- - -## The GNU General Public License (GPL) Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor - Boston, MA 02110-1335 - USA - - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your freedom to - share and change it. By contrast, the GNU General Public License is - intended to guarantee your freedom to share and change free software--to - make sure the software is free for all its users. This General Public - License applies to most of the Free Software Foundation's software and - to any other program whose authors commit to using it. (Some other Free - Software Foundation software is covered by the GNU Library General - Public License instead.) You can apply it to your programs, too. - - When we speak of free software, we are referring to freedom, not price. - Our General Public Licenses are designed to make sure that you have the - freedom to distribute copies of free software (and charge for this - service if you wish), that you receive source code or can get it if you - want it, that you can change the software or use pieces of it in new - free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid anyone - to deny you these rights or to ask you to surrender the rights. These - restrictions translate to certain responsibilities for you if you - distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether gratis - or for a fee, you must give the recipients all the rights that you have. - You must make sure that they, too, receive or can get the source code. - And you must show them these terms so they know their rights. - - We protect your rights with two steps: (1) copyright the software, and - (2) offer you this license which gives you legal permission to copy, - distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain - that everyone understands that there is no warranty for this free - software. If the software is modified by someone else and passed on, we - want its recipients to know that what they have is not the original, so - that any problems introduced by others will not reflect on the original - authors' reputations. - - Finally, any free program is threatened constantly by software patents. - We wish to avoid the danger that redistributors of a free program will - individually obtain patent licenses, in effect making the program - proprietary. To prevent this, we have made it clear that any patent must - be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and - modification follow. - - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains a - notice placed by the copyright holder saying it may be distributed under - the terms of this General Public License. The "Program", below, refers - to any such program or work, and a "work based on the Program" means - either the Program or any derivative work under copyright law: that is - to say, a work containing the Program or a portion of it, either - verbatim or with modifications and/or translated into another language. - (Hereinafter, translation is included without limitation in the term - "modification".) Each licensee is addressed as "you". - - Activities other than copying, distribution and modification are not - covered by this License; they are outside its scope. The act of running - the Program is not restricted, and the output from the Program is - covered only if its contents constitute a work based on the Program - (independent of having been made by running the Program). Whether that - is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's source - code as you receive it, in any medium, provided that you conspicuously - and appropriately publish on each copy an appropriate copyright notice - and disclaimer of warranty; keep intact all the notices that refer to - this License and to the absence of any warranty; and give any other - recipients of the Program a copy of this License along with the Program. - - You may charge a fee for the physical act of transferring a copy, and - you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion of - it, thus forming a work based on the Program, and copy and distribute - such modifications or work under the terms of Section 1 above, provided - that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any part - thereof, to be licensed as a whole at no charge to all third parties - under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a notice - that there is no warranty (or else, saying that you provide a - warranty) and that users may redistribute the program under these - conditions, and telling the user how to view a copy of this License. - (Exception: if the Program itself is interactive but does not - normally print such an announcement, your work based on the Program - is not required to print an announcement.) - - These requirements apply to the modified work as a whole. If - identifiable sections of that work are not derived from the Program, and - can be reasonably considered independent and separate works in - themselves, then this License, and its terms, do not apply to those - sections when you distribute them as separate works. But when you - distribute the same sections as part of a whole which is a work based on - the Program, the distribution of the whole must be on the terms of this - License, whose permissions for other licensees extend to the entire - whole, and thus to each and every part regardless of who wrote it. - - Thus, it is not the intent of this section to claim rights or contest - your rights to work written entirely by you; rather, the intent is to - exercise the right to control the distribution of derivative or - collective works based on the Program. - - In addition, mere aggregation of another work not based on the Program - with the Program (or with a work based on the Program) on a volume of a - storage or distribution medium does not bring the other work under the - scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, - under Section 2) in object code or executable form under the terms of - Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your cost - of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed - only for noncommercial distribution and only if you received the - program in object code or executable form with such an offer, in - accord with Subsection b above.) - - The source code for a work means the preferred form of the work for - making modifications to it. For an executable work, complete source code - means all the source code for all modules it contains, plus any - associated interface definition files, plus the scripts used to control - compilation and installation of the executable. However, as a special - exception, the source code distributed need not include anything that is - normally distributed (in either source or binary form) with the major - components (compiler, kernel, and so on) of the operating system on - which the executable runs, unless that component itself accompanies the - executable. - - If distribution of executable or object code is made by offering access - to copy from a designated place, then offering equivalent access to copy - the source code from the same place counts as distribution of the source - code, even though third parties are not compelled to copy the source - along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program - except as expressly provided under this License. Any attempt otherwise - to copy, modify, sublicense or distribute the Program is void, and will - automatically terminate your rights under this License. However, parties - who have received copies, or rights, from you under this License will - not have their licenses terminated so long as such parties remain in - full compliance. - - 5. You are not required to accept this License, since you have not - signed it. However, nothing else grants you permission to modify or - distribute the Program or its derivative works. These actions are - prohibited by law if you do not accept this License. Therefore, by - modifying or distributing the Program (or any work based on the - Program), you indicate your acceptance of this License to do so, and all - its terms and conditions for copying, distributing or modifying the - Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the - Program), the recipient automatically receives a license from the - original licensor to copy, distribute or modify the Program subject to - these terms and conditions. You may not impose any further restrictions - on the recipients' exercise of the rights granted herein. You are not - responsible for enforcing compliance by third parties to this License. - - 7. If, as a consequence of a court judgment or allegation of patent - infringement or for any other reason (not limited to patent issues), - conditions are imposed on you (whether by court order, agreement or - otherwise) that contradict the conditions of this License, they do not - excuse you from the conditions of this License. If you cannot distribute - so as to satisfy simultaneously your obligations under this License and - any other pertinent obligations, then as a consequence you may not - distribute the Program at all. For example, if a patent license would - not permit royalty-free redistribution of the Program by all those who - receive copies directly or indirectly through you, then the only way you - could satisfy both it and this License would be to refrain entirely from - distribution of the Program. - - If any portion of this section is held invalid or unenforceable under - any particular circumstance, the balance of the section is intended to - apply and the section as a whole is intended to apply in other - circumstances. - - It is not the purpose of this section to induce you to infringe any - patents or other property right claims or to contest validity of any - such claims; this section has the sole purpose of protecting the - integrity of the free software distribution system, which is implemented - by public license practices. Many people have made generous - contributions to the wide range of software distributed through that - system in reliance on consistent application of that system; it is up to - the author/donor to decide if he or she is willing to distribute - software through any other system and a licensee cannot impose that choice. - - This section is intended to make thoroughly clear what is believed to be - a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in - certain countries either by patents or by copyrighted interfaces, the - original copyright holder who places the Program under this License may - add an explicit geographical distribution limitation excluding those - countries, so that distribution is permitted only in or among countries - not thus excluded. In such case, this License incorporates the - limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new - versions of the 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 Program - specifies a version number of this License which applies to it and "any - later version", you have the option of following the terms and - conditions either of that version or of any later version published by - the Free Software Foundation. If the Program does not specify a version - number of this License, you may choose any version ever published by the - Free Software Foundation. - - 10. If you wish to incorporate parts of the Program into other free - programs whose distribution conditions are different, write to the - author to ask for permission. For software which is copyrighted by the - Free Software Foundation, write to the Free Software Foundation; we - sometimes make exceptions for this. Our decision will be guided by the - two goals of preserving the free status of all derivatives of our free - software and of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO - WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. - EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR - OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, - EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE - ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH - YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL - NECESSARY SERVICING, REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN - WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY - AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR - DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL - DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM - (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED - INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF - THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR - OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest - possible use to the public, the best way to achieve this is to make it - free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest to - attach them to the start of each source file to most effectively convey - the exclusion of warranty; and each file should have at least the - "copyright" line and a pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA - - Also add information on how to contact you by electronic and paper mail. - - If the program is interactive, make it output a short notice like this - when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type - `show w'. This is free software, and you are welcome to redistribute - it under certain conditions; type `show c' for details. - - The hypothetical commands `show w' and `show c' should show the - appropriate parts of the General Public License. Of course, the commands - you use may be called something other than `show w' and `show c'; they - could even be mouse-clicks or menu items--whatever suits your program. - - You should also get your employer (if you work as a programmer) or your - school, if any, to sign a "copyright disclaimer" for the program, if - necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - program `Gnomovision' (which makes passes at compilers) written by - James Hacker. - - signature of Ty Coon, 1 April 1989 - Ty Coon, President of Vice - - This General Public License does not permit incorporating your program - into proprietary programs. If your program is a subroutine library, you - may consider it more useful to permit linking proprietary applications - with the library. If this is what you want to do, use the GNU Library - General Public License instead of this License. - ---- - -## CLASSPATH EXCEPTION - - Linking this library statically or dynamically with other modules is - making a combined work based on this library. Thus, the terms and - conditions of the GNU General Public License version 2 cover the whole - combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent - modules, and to copy and distribute the resulting executable under - terms of your choice, provided that you also meet, for each linked - independent module, the terms and conditions of the license of that - module. An independent module is a module which is not derived from or - based on this library. If you modify this library, you may extend this - exception to your version of the library, but you are not obligated to - do so. If you do not wish to do so, delete this exception statement - from your version. \ No newline at end of file diff --git a/material/licenses/backend/LICENSE-org.eclipse.persistence.jpql.txt b/material/licenses/backend/LICENSE-org.eclipse.persistence.jpql.txt deleted file mode 100644 index 3b7ae66064..0000000000 --- a/material/licenses/backend/LICENSE-org.eclipse.persistence.jpql.txt +++ /dev/null @@ -1,637 +0,0 @@ -# Eclipse Public License - v 2.0 - - THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE - PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION - OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - - 1. DEFINITIONS - - "Contribution" means: - - a) in the case of the initial Contributor, the initial content - Distributed under this Agreement, and - - b) in the case of each subsequent Contributor: - i) changes to the Program, and - ii) additions to the Program; - where such changes and/or additions to the Program originate from - and are Distributed by that particular Contributor. A Contribution - "originates" from a Contributor if it was added to the Program by - such Contributor itself or anyone acting on such Contributor's behalf. - Contributions do not include changes or additions to the Program that - are not Modified Works. - - "Contributor" means any person or entity that Distributes the Program. - - "Licensed Patents" mean patent claims licensable by a Contributor which - are necessarily infringed by the use or sale of its Contribution alone - or when combined with the Program. - - "Program" means the Contributions Distributed in accordance with this - Agreement. - - "Recipient" means anyone who receives the Program under this Agreement - or any Secondary License (as applicable), including Contributors. - - "Derivative Works" shall mean any work, whether in Source Code or other - form, that is based on (or derived from) the Program and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. - - "Modified Works" shall mean any work in Source Code or other form that - results from an addition to, deletion from, or modification of the - contents of the Program, including, for purposes of clarity any new file - in Source Code form that contains any contents of the Program. Modified - Works shall not include works that contain only declarations, - interfaces, types, classes, structures, or files of the Program solely - in each case in order to link to, bind by name, or subclass the Program - or Modified Works thereof. - - "Distribute" means the acts of a) distributing or b) making available - in any manner that enables the transfer of a copy. - - "Source Code" means the form of a Program preferred for making - modifications, including but not limited to software source code, - documentation source, and configuration files. - - "Secondary License" means either the GNU General Public License, - Version 2.0, or any later versions of that license, including any - exceptions or additional permissions as identified by the initial - Contributor. - - 2. GRANT OF RIGHTS - - a) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free copyright - license to reproduce, prepare Derivative Works of, publicly display, - publicly perform, Distribute and sublicense the Contribution of such - Contributor, if any, and such Derivative Works. - - b) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free patent - license under Licensed Patents to make, use, sell, offer to sell, - import and otherwise transfer the Contribution of such Contributor, - if any, in Source Code or other form. This patent license shall - apply to the combination of the Contribution and the Program if, at - the time the Contribution is added by the Contributor, such addition - of the Contribution causes such combination to be covered by the - Licensed Patents. The patent license shall not apply to any other - combinations which include the Contribution. No hardware per se is - licensed hereunder. - - c) Recipient understands that although each Contributor grants the - licenses to its Contributions set forth herein, no assurances are - provided by any Contributor that the Program does not infringe the - patent or other intellectual property rights of any other entity. - Each Contributor disclaims any liability to Recipient for claims - brought by any other entity based on infringement of intellectual - property rights or otherwise. As a condition to exercising the - rights and licenses granted hereunder, each Recipient hereby - assumes sole responsibility to secure any other intellectual - property rights needed, if any. For example, if a third party - patent license is required to allow Recipient to Distribute the - Program, it is Recipient's responsibility to acquire that license - before distributing the Program. - - d) Each Contributor represents that to its knowledge it has - sufficient copyright rights in its Contribution, if any, to grant - the copyright license set forth in this Agreement. - - e) Notwithstanding the terms of any Secondary License, no - Contributor makes additional grants to any Recipient (other than - those set forth in this Agreement) as a result of such Recipient's - receipt of the Program under the terms of a Secondary License - (if permitted under the terms of Section 3). - - 3. REQUIREMENTS - - 3.1 If a Contributor Distributes the Program in any form, then: - - a) the Program must also be made available as Source Code, in - accordance with section 3.2, and the Contributor must accompany - the Program with a statement that the Source Code for the Program - is available under this Agreement, and informs Recipients how to - obtain it in a reasonable manner on or through a medium customarily - used for software exchange; and - - b) the Contributor may Distribute the Program under a license - different than this Agreement, provided that such license: - i) effectively disclaims on behalf of all other Contributors all - warranties and conditions, express and implied, including - warranties or conditions of title and non-infringement, and - implied warranties or conditions of merchantability and fitness - for a particular purpose; - - ii) effectively excludes on behalf of all other Contributors all - liability for damages, including direct, indirect, special, - incidental and consequential damages, such as lost profits; - - iii) does not attempt to limit or alter the recipients' rights - in the Source Code under section 3.2; and - - iv) requires any subsequent distribution of the Program by any - party to be under a license that satisfies the requirements - of this section 3. - - 3.2 When the Program is Distributed as Source Code: - - a) it must be made available under this Agreement, or if the - Program (i) is combined with other material in a separate file or - files made available under a Secondary License, and (ii) the initial - Contributor attached to the Source Code the notice described in - Exhibit A of this Agreement, then the Program may be made available - under the terms of such Secondary Licenses, and - - b) a copy of this Agreement must be included with each copy of - the Program. - - 3.3 Contributors may not remove or alter any copyright, patent, - trademark, attribution notices, disclaimers of warranty, or limitations - of liability ("notices") contained within the Program from any copy of - the Program which they Distribute, provided that Contributors may add - their own appropriate notices. - - 4. COMMERCIAL DISTRIBUTION - - Commercial distributors of software may accept certain responsibilities - with respect to end users, business partners and the like. While this - license is intended to facilitate the commercial use of the Program, - the Contributor who includes the Program in a commercial product - offering should do so in a manner which does not create potential - liability for other Contributors. Therefore, if a Contributor includes - the Program in a commercial product offering, such Contributor - ("Commercial Contributor") hereby agrees to defend and indemnify every - other Contributor ("Indemnified Contributor") against any losses, - damages and costs (collectively "Losses") arising from claims, lawsuits - and other legal actions brought by a third party against the Indemnified - Contributor to the extent caused by the acts or omissions of such - Commercial Contributor in connection with its distribution of the Program - in a commercial product offering. The obligations in this section do not - apply to any claims or Losses relating to any actual or alleged - intellectual property infringement. In order to qualify, an Indemnified - Contributor must: a) promptly notify the Commercial Contributor in - writing of such claim, and b) allow the Commercial Contributor to control, - and cooperate with the Commercial Contributor in, the defense and any - related settlement negotiations. The Indemnified Contributor may - participate in any such claim at its own expense. - - For example, a Contributor might include the Program in a commercial - product offering, Product X. That Contributor is then a Commercial - Contributor. If that Commercial Contributor then makes performance - claims, or offers warranties related to Product X, those performance - claims and warranties are such Commercial Contributor's responsibility - alone. Under this section, the Commercial Contributor would have to - defend claims against the other Contributors related to those performance - claims and warranties, and if a court requires any other Contributor to - pay any damages as a result, the Commercial Contributor must pay - those damages. - - 5. NO WARRANTY - - EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT - PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS" - BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR - IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF - TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR - PURPOSE. Each Recipient is solely responsible for determining the - appropriateness of using and distributing the Program and assumes all - risks associated with its exercise of rights under this Agreement, - including but not limited to the risks and costs of program errors, - compliance with applicable laws, damage to or loss of data, programs - or equipment, and unavailability or interruption of operations. - - 6. DISCLAIMER OF LIABILITY - - EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT - PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS - SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST - PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE - EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGES. - - 7. GENERAL - - If any provision of this Agreement is invalid or unenforceable under - applicable law, it shall not affect the validity or enforceability of - the remainder of the terms of this Agreement, and without further - action by the parties hereto, such provision shall be reformed to the - minimum extent necessary to make such provision valid and enforceable. - - If Recipient institutes patent litigation against any entity - (including a cross-claim or counterclaim in a lawsuit) alleging that the - Program itself (excluding combinations of the Program with other software - or hardware) infringes such Recipient's patent(s), then such Recipient's - rights granted under Section 2(b) shall terminate as of the date such - litigation is filed. - - All Recipient's rights under this Agreement shall terminate if it - fails to comply with any of the material terms or conditions of this - Agreement and does not cure such failure in a reasonable period of - time after becoming aware of such noncompliance. If all Recipient's - rights under this Agreement terminate, Recipient agrees to cease use - and distribution of the Program as soon as reasonably practicable. - However, Recipient's obligations under this Agreement and any licenses - granted by Recipient relating to the Program shall continue and survive. - - Everyone is permitted to copy and distribute copies of this Agreement, - but in order to avoid inconsistency the Agreement is copyrighted and - may only be modified in the following manner. The Agreement Steward - reserves the right to publish new versions (including revisions) of - this Agreement from time to time. No one other than the Agreement - Steward has the right to modify this Agreement. The Eclipse Foundation - is the initial Agreement Steward. The Eclipse Foundation may assign the - responsibility to serve as the Agreement Steward to a suitable separate - entity. Each new version of the Agreement will be given a distinguishing - version number. The Program (including Contributions) may always be - Distributed subject to the version of the Agreement under which it was - received. In addition, after a new version of the Agreement is published, - Contributor may elect to Distribute the Program (including its - Contributions) under the new version. - - Except as expressly stated in Sections 2(a) and 2(b) above, Recipient - receives no rights or licenses to the intellectual property of any - Contributor under this Agreement, whether expressly, by implication, - estoppel or otherwise. All rights in the Program not expressly granted - under this Agreement are reserved. Nothing in this Agreement is intended - to be enforceable by any entity that is not a Contributor or Recipient. - No third-party beneficiary rights are created under this Agreement. - - Exhibit A - Form of Secondary Licenses Notice - - "This Source Code may also be made available under the following - Secondary Licenses when the conditions for such availability set forth - in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), - version(s), and exceptions or additional permissions here}." - - Simply including a copy of this Agreement, including this Exhibit A - is not sufficient to license the Source Code under Secondary Licenses. - - If it is not possible or desirable to put the notice in a particular - file, then You may include the notice in a location (such as a LICENSE - file in a relevant directory) where a recipient would be likely to - look for such a notice. - - You may add additional accurate notices of copyright ownership. - ---- - -## The GNU General Public License (GPL) Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor - Boston, MA 02110-1335 - USA - - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your freedom to - share and change it. By contrast, the GNU General Public License is - intended to guarantee your freedom to share and change free software--to - make sure the software is free for all its users. This General Public - License applies to most of the Free Software Foundation's software and - to any other program whose authors commit to using it. (Some other Free - Software Foundation software is covered by the GNU Library General - Public License instead.) You can apply it to your programs, too. - - When we speak of free software, we are referring to freedom, not price. - Our General Public Licenses are designed to make sure that you have the - freedom to distribute copies of free software (and charge for this - service if you wish), that you receive source code or can get it if you - want it, that you can change the software or use pieces of it in new - free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid anyone - to deny you these rights or to ask you to surrender the rights. These - restrictions translate to certain responsibilities for you if you - distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether gratis - or for a fee, you must give the recipients all the rights that you have. - You must make sure that they, too, receive or can get the source code. - And you must show them these terms so they know their rights. - - We protect your rights with two steps: (1) copyright the software, and - (2) offer you this license which gives you legal permission to copy, - distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain - that everyone understands that there is no warranty for this free - software. If the software is modified by someone else and passed on, we - want its recipients to know that what they have is not the original, so - that any problems introduced by others will not reflect on the original - authors' reputations. - - Finally, any free program is threatened constantly by software patents. - We wish to avoid the danger that redistributors of a free program will - individually obtain patent licenses, in effect making the program - proprietary. To prevent this, we have made it clear that any patent must - be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and - modification follow. - - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains a - notice placed by the copyright holder saying it may be distributed under - the terms of this General Public License. The "Program", below, refers - to any such program or work, and a "work based on the Program" means - either the Program or any derivative work under copyright law: that is - to say, a work containing the Program or a portion of it, either - verbatim or with modifications and/or translated into another language. - (Hereinafter, translation is included without limitation in the term - "modification".) Each licensee is addressed as "you". - - Activities other than copying, distribution and modification are not - covered by this License; they are outside its scope. The act of running - the Program is not restricted, and the output from the Program is - covered only if its contents constitute a work based on the Program - (independent of having been made by running the Program). Whether that - is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's source - code as you receive it, in any medium, provided that you conspicuously - and appropriately publish on each copy an appropriate copyright notice - and disclaimer of warranty; keep intact all the notices that refer to - this License and to the absence of any warranty; and give any other - recipients of the Program a copy of this License along with the Program. - - You may charge a fee for the physical act of transferring a copy, and - you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion of - it, thus forming a work based on the Program, and copy and distribute - such modifications or work under the terms of Section 1 above, provided - that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any part - thereof, to be licensed as a whole at no charge to all third parties - under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a notice - that there is no warranty (or else, saying that you provide a - warranty) and that users may redistribute the program under these - conditions, and telling the user how to view a copy of this License. - (Exception: if the Program itself is interactive but does not - normally print such an announcement, your work based on the Program - is not required to print an announcement.) - - These requirements apply to the modified work as a whole. If - identifiable sections of that work are not derived from the Program, and - can be reasonably considered independent and separate works in - themselves, then this License, and its terms, do not apply to those - sections when you distribute them as separate works. But when you - distribute the same sections as part of a whole which is a work based on - the Program, the distribution of the whole must be on the terms of this - License, whose permissions for other licensees extend to the entire - whole, and thus to each and every part regardless of who wrote it. - - Thus, it is not the intent of this section to claim rights or contest - your rights to work written entirely by you; rather, the intent is to - exercise the right to control the distribution of derivative or - collective works based on the Program. - - In addition, mere aggregation of another work not based on the Program - with the Program (or with a work based on the Program) on a volume of a - storage or distribution medium does not bring the other work under the - scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, - under Section 2) in object code or executable form under the terms of - Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your cost - of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed - only for noncommercial distribution and only if you received the - program in object code or executable form with such an offer, in - accord with Subsection b above.) - - The source code for a work means the preferred form of the work for - making modifications to it. For an executable work, complete source code - means all the source code for all modules it contains, plus any - associated interface definition files, plus the scripts used to control - compilation and installation of the executable. However, as a special - exception, the source code distributed need not include anything that is - normally distributed (in either source or binary form) with the major - components (compiler, kernel, and so on) of the operating system on - which the executable runs, unless that component itself accompanies the - executable. - - If distribution of executable or object code is made by offering access - to copy from a designated place, then offering equivalent access to copy - the source code from the same place counts as distribution of the source - code, even though third parties are not compelled to copy the source - along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program - except as expressly provided under this License. Any attempt otherwise - to copy, modify, sublicense or distribute the Program is void, and will - automatically terminate your rights under this License. However, parties - who have received copies, or rights, from you under this License will - not have their licenses terminated so long as such parties remain in - full compliance. - - 5. You are not required to accept this License, since you have not - signed it. However, nothing else grants you permission to modify or - distribute the Program or its derivative works. These actions are - prohibited by law if you do not accept this License. Therefore, by - modifying or distributing the Program (or any work based on the - Program), you indicate your acceptance of this License to do so, and all - its terms and conditions for copying, distributing or modifying the - Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the - Program), the recipient automatically receives a license from the - original licensor to copy, distribute or modify the Program subject to - these terms and conditions. You may not impose any further restrictions - on the recipients' exercise of the rights granted herein. You are not - responsible for enforcing compliance by third parties to this License. - - 7. If, as a consequence of a court judgment or allegation of patent - infringement or for any other reason (not limited to patent issues), - conditions are imposed on you (whether by court order, agreement or - otherwise) that contradict the conditions of this License, they do not - excuse you from the conditions of this License. If you cannot distribute - so as to satisfy simultaneously your obligations under this License and - any other pertinent obligations, then as a consequence you may not - distribute the Program at all. For example, if a patent license would - not permit royalty-free redistribution of the Program by all those who - receive copies directly or indirectly through you, then the only way you - could satisfy both it and this License would be to refrain entirely from - distribution of the Program. - - If any portion of this section is held invalid or unenforceable under - any particular circumstance, the balance of the section is intended to - apply and the section as a whole is intended to apply in other - circumstances. - - It is not the purpose of this section to induce you to infringe any - patents or other property right claims or to contest validity of any - such claims; this section has the sole purpose of protecting the - integrity of the free software distribution system, which is implemented - by public license practices. Many people have made generous - contributions to the wide range of software distributed through that - system in reliance on consistent application of that system; it is up to - the author/donor to decide if he or she is willing to distribute - software through any other system and a licensee cannot impose that choice. - - This section is intended to make thoroughly clear what is believed to be - a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in - certain countries either by patents or by copyrighted interfaces, the - original copyright holder who places the Program under this License may - add an explicit geographical distribution limitation excluding those - countries, so that distribution is permitted only in or among countries - not thus excluded. In such case, this License incorporates the - limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new - versions of the 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 Program - specifies a version number of this License which applies to it and "any - later version", you have the option of following the terms and - conditions either of that version or of any later version published by - the Free Software Foundation. If the Program does not specify a version - number of this License, you may choose any version ever published by the - Free Software Foundation. - - 10. If you wish to incorporate parts of the Program into other free - programs whose distribution conditions are different, write to the - author to ask for permission. For software which is copyrighted by the - Free Software Foundation, write to the Free Software Foundation; we - sometimes make exceptions for this. Our decision will be guided by the - two goals of preserving the free status of all derivatives of our free - software and of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO - WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. - EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR - OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, - EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE - ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH - YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL - NECESSARY SERVICING, REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN - WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY - AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR - DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL - DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM - (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED - INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF - THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR - OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest - possible use to the public, the best way to achieve this is to make it - free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest to - attach them to the start of each source file to most effectively convey - the exclusion of warranty; and each file should have at least the - "copyright" line and a pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA - - Also add information on how to contact you by electronic and paper mail. - - If the program is interactive, make it output a short notice like this - when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type - `show w'. This is free software, and you are welcome to redistribute - it under certain conditions; type `show c' for details. - - The hypothetical commands `show w' and `show c' should show the - appropriate parts of the General Public License. Of course, the commands - you use may be called something other than `show w' and `show c'; they - could even be mouse-clicks or menu items--whatever suits your program. - - You should also get your employer (if you work as a programmer) or your - school, if any, to sign a "copyright disclaimer" for the program, if - necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - program `Gnomovision' (which makes passes at compilers) written by - James Hacker. - - signature of Ty Coon, 1 April 1989 - Ty Coon, President of Vice - - This General Public License does not permit incorporating your program - into proprietary programs. If your program is a subroutine library, you - may consider it more useful to permit linking proprietary applications - with the library. If this is what you want to do, use the GNU Library - General Public License instead of this License. - ---- - -## CLASSPATH EXCEPTION - - Linking this library statically or dynamically with other modules is - making a combined work based on this library. Thus, the terms and - conditions of the GNU General Public License version 2 cover the whole - combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent - modules, and to copy and distribute the resulting executable under - terms of your choice, provided that you also meet, for each linked - independent module, the terms and conditions of the license of that - module. An independent module is a module which is not derived from or - based on this library. If you modify this library, you may extend this - exception to your version of the library, but you are not obligated to - do so. If you do not wish to do so, delete this exception statement - from your version. \ No newline at end of file diff --git a/material/licenses/backend/LICENSE-org.eclipse.persistence.txt b/material/licenses/backend/LICENSE-org.eclipse.persistence.txt deleted file mode 100644 index 3b7ae66064..0000000000 --- a/material/licenses/backend/LICENSE-org.eclipse.persistence.txt +++ /dev/null @@ -1,637 +0,0 @@ -# Eclipse Public License - v 2.0 - - THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE - PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION - OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - - 1. DEFINITIONS - - "Contribution" means: - - a) in the case of the initial Contributor, the initial content - Distributed under this Agreement, and - - b) in the case of each subsequent Contributor: - i) changes to the Program, and - ii) additions to the Program; - where such changes and/or additions to the Program originate from - and are Distributed by that particular Contributor. A Contribution - "originates" from a Contributor if it was added to the Program by - such Contributor itself or anyone acting on such Contributor's behalf. - Contributions do not include changes or additions to the Program that - are not Modified Works. - - "Contributor" means any person or entity that Distributes the Program. - - "Licensed Patents" mean patent claims licensable by a Contributor which - are necessarily infringed by the use or sale of its Contribution alone - or when combined with the Program. - - "Program" means the Contributions Distributed in accordance with this - Agreement. - - "Recipient" means anyone who receives the Program under this Agreement - or any Secondary License (as applicable), including Contributors. - - "Derivative Works" shall mean any work, whether in Source Code or other - form, that is based on (or derived from) the Program and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. - - "Modified Works" shall mean any work in Source Code or other form that - results from an addition to, deletion from, or modification of the - contents of the Program, including, for purposes of clarity any new file - in Source Code form that contains any contents of the Program. Modified - Works shall not include works that contain only declarations, - interfaces, types, classes, structures, or files of the Program solely - in each case in order to link to, bind by name, or subclass the Program - or Modified Works thereof. - - "Distribute" means the acts of a) distributing or b) making available - in any manner that enables the transfer of a copy. - - "Source Code" means the form of a Program preferred for making - modifications, including but not limited to software source code, - documentation source, and configuration files. - - "Secondary License" means either the GNU General Public License, - Version 2.0, or any later versions of that license, including any - exceptions or additional permissions as identified by the initial - Contributor. - - 2. GRANT OF RIGHTS - - a) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free copyright - license to reproduce, prepare Derivative Works of, publicly display, - publicly perform, Distribute and sublicense the Contribution of such - Contributor, if any, and such Derivative Works. - - b) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free patent - license under Licensed Patents to make, use, sell, offer to sell, - import and otherwise transfer the Contribution of such Contributor, - if any, in Source Code or other form. This patent license shall - apply to the combination of the Contribution and the Program if, at - the time the Contribution is added by the Contributor, such addition - of the Contribution causes such combination to be covered by the - Licensed Patents. The patent license shall not apply to any other - combinations which include the Contribution. No hardware per se is - licensed hereunder. - - c) Recipient understands that although each Contributor grants the - licenses to its Contributions set forth herein, no assurances are - provided by any Contributor that the Program does not infringe the - patent or other intellectual property rights of any other entity. - Each Contributor disclaims any liability to Recipient for claims - brought by any other entity based on infringement of intellectual - property rights or otherwise. As a condition to exercising the - rights and licenses granted hereunder, each Recipient hereby - assumes sole responsibility to secure any other intellectual - property rights needed, if any. For example, if a third party - patent license is required to allow Recipient to Distribute the - Program, it is Recipient's responsibility to acquire that license - before distributing the Program. - - d) Each Contributor represents that to its knowledge it has - sufficient copyright rights in its Contribution, if any, to grant - the copyright license set forth in this Agreement. - - e) Notwithstanding the terms of any Secondary License, no - Contributor makes additional grants to any Recipient (other than - those set forth in this Agreement) as a result of such Recipient's - receipt of the Program under the terms of a Secondary License - (if permitted under the terms of Section 3). - - 3. REQUIREMENTS - - 3.1 If a Contributor Distributes the Program in any form, then: - - a) the Program must also be made available as Source Code, in - accordance with section 3.2, and the Contributor must accompany - the Program with a statement that the Source Code for the Program - is available under this Agreement, and informs Recipients how to - obtain it in a reasonable manner on or through a medium customarily - used for software exchange; and - - b) the Contributor may Distribute the Program under a license - different than this Agreement, provided that such license: - i) effectively disclaims on behalf of all other Contributors all - warranties and conditions, express and implied, including - warranties or conditions of title and non-infringement, and - implied warranties or conditions of merchantability and fitness - for a particular purpose; - - ii) effectively excludes on behalf of all other Contributors all - liability for damages, including direct, indirect, special, - incidental and consequential damages, such as lost profits; - - iii) does not attempt to limit or alter the recipients' rights - in the Source Code under section 3.2; and - - iv) requires any subsequent distribution of the Program by any - party to be under a license that satisfies the requirements - of this section 3. - - 3.2 When the Program is Distributed as Source Code: - - a) it must be made available under this Agreement, or if the - Program (i) is combined with other material in a separate file or - files made available under a Secondary License, and (ii) the initial - Contributor attached to the Source Code the notice described in - Exhibit A of this Agreement, then the Program may be made available - under the terms of such Secondary Licenses, and - - b) a copy of this Agreement must be included with each copy of - the Program. - - 3.3 Contributors may not remove or alter any copyright, patent, - trademark, attribution notices, disclaimers of warranty, or limitations - of liability ("notices") contained within the Program from any copy of - the Program which they Distribute, provided that Contributors may add - their own appropriate notices. - - 4. COMMERCIAL DISTRIBUTION - - Commercial distributors of software may accept certain responsibilities - with respect to end users, business partners and the like. While this - license is intended to facilitate the commercial use of the Program, - the Contributor who includes the Program in a commercial product - offering should do so in a manner which does not create potential - liability for other Contributors. Therefore, if a Contributor includes - the Program in a commercial product offering, such Contributor - ("Commercial Contributor") hereby agrees to defend and indemnify every - other Contributor ("Indemnified Contributor") against any losses, - damages and costs (collectively "Losses") arising from claims, lawsuits - and other legal actions brought by a third party against the Indemnified - Contributor to the extent caused by the acts or omissions of such - Commercial Contributor in connection with its distribution of the Program - in a commercial product offering. The obligations in this section do not - apply to any claims or Losses relating to any actual or alleged - intellectual property infringement. In order to qualify, an Indemnified - Contributor must: a) promptly notify the Commercial Contributor in - writing of such claim, and b) allow the Commercial Contributor to control, - and cooperate with the Commercial Contributor in, the defense and any - related settlement negotiations. The Indemnified Contributor may - participate in any such claim at its own expense. - - For example, a Contributor might include the Program in a commercial - product offering, Product X. That Contributor is then a Commercial - Contributor. If that Commercial Contributor then makes performance - claims, or offers warranties related to Product X, those performance - claims and warranties are such Commercial Contributor's responsibility - alone. Under this section, the Commercial Contributor would have to - defend claims against the other Contributors related to those performance - claims and warranties, and if a court requires any other Contributor to - pay any damages as a result, the Commercial Contributor must pay - those damages. - - 5. NO WARRANTY - - EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT - PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS" - BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR - IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF - TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR - PURPOSE. Each Recipient is solely responsible for determining the - appropriateness of using and distributing the Program and assumes all - risks associated with its exercise of rights under this Agreement, - including but not limited to the risks and costs of program errors, - compliance with applicable laws, damage to or loss of data, programs - or equipment, and unavailability or interruption of operations. - - 6. DISCLAIMER OF LIABILITY - - EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT - PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS - SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST - PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE - EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGES. - - 7. GENERAL - - If any provision of this Agreement is invalid or unenforceable under - applicable law, it shall not affect the validity or enforceability of - the remainder of the terms of this Agreement, and without further - action by the parties hereto, such provision shall be reformed to the - minimum extent necessary to make such provision valid and enforceable. - - If Recipient institutes patent litigation against any entity - (including a cross-claim or counterclaim in a lawsuit) alleging that the - Program itself (excluding combinations of the Program with other software - or hardware) infringes such Recipient's patent(s), then such Recipient's - rights granted under Section 2(b) shall terminate as of the date such - litigation is filed. - - All Recipient's rights under this Agreement shall terminate if it - fails to comply with any of the material terms or conditions of this - Agreement and does not cure such failure in a reasonable period of - time after becoming aware of such noncompliance. If all Recipient's - rights under this Agreement terminate, Recipient agrees to cease use - and distribution of the Program as soon as reasonably practicable. - However, Recipient's obligations under this Agreement and any licenses - granted by Recipient relating to the Program shall continue and survive. - - Everyone is permitted to copy and distribute copies of this Agreement, - but in order to avoid inconsistency the Agreement is copyrighted and - may only be modified in the following manner. The Agreement Steward - reserves the right to publish new versions (including revisions) of - this Agreement from time to time. No one other than the Agreement - Steward has the right to modify this Agreement. The Eclipse Foundation - is the initial Agreement Steward. The Eclipse Foundation may assign the - responsibility to serve as the Agreement Steward to a suitable separate - entity. Each new version of the Agreement will be given a distinguishing - version number. The Program (including Contributions) may always be - Distributed subject to the version of the Agreement under which it was - received. In addition, after a new version of the Agreement is published, - Contributor may elect to Distribute the Program (including its - Contributions) under the new version. - - Except as expressly stated in Sections 2(a) and 2(b) above, Recipient - receives no rights or licenses to the intellectual property of any - Contributor under this Agreement, whether expressly, by implication, - estoppel or otherwise. All rights in the Program not expressly granted - under this Agreement are reserved. Nothing in this Agreement is intended - to be enforceable by any entity that is not a Contributor or Recipient. - No third-party beneficiary rights are created under this Agreement. - - Exhibit A - Form of Secondary Licenses Notice - - "This Source Code may also be made available under the following - Secondary Licenses when the conditions for such availability set forth - in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), - version(s), and exceptions or additional permissions here}." - - Simply including a copy of this Agreement, including this Exhibit A - is not sufficient to license the Source Code under Secondary Licenses. - - If it is not possible or desirable to put the notice in a particular - file, then You may include the notice in a location (such as a LICENSE - file in a relevant directory) where a recipient would be likely to - look for such a notice. - - You may add additional accurate notices of copyright ownership. - ---- - -## The GNU General Public License (GPL) Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor - Boston, MA 02110-1335 - USA - - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your freedom to - share and change it. By contrast, the GNU General Public License is - intended to guarantee your freedom to share and change free software--to - make sure the software is free for all its users. This General Public - License applies to most of the Free Software Foundation's software and - to any other program whose authors commit to using it. (Some other Free - Software Foundation software is covered by the GNU Library General - Public License instead.) You can apply it to your programs, too. - - When we speak of free software, we are referring to freedom, not price. - Our General Public Licenses are designed to make sure that you have the - freedom to distribute copies of free software (and charge for this - service if you wish), that you receive source code or can get it if you - want it, that you can change the software or use pieces of it in new - free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid anyone - to deny you these rights or to ask you to surrender the rights. These - restrictions translate to certain responsibilities for you if you - distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether gratis - or for a fee, you must give the recipients all the rights that you have. - You must make sure that they, too, receive or can get the source code. - And you must show them these terms so they know their rights. - - We protect your rights with two steps: (1) copyright the software, and - (2) offer you this license which gives you legal permission to copy, - distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain - that everyone understands that there is no warranty for this free - software. If the software is modified by someone else and passed on, we - want its recipients to know that what they have is not the original, so - that any problems introduced by others will not reflect on the original - authors' reputations. - - Finally, any free program is threatened constantly by software patents. - We wish to avoid the danger that redistributors of a free program will - individually obtain patent licenses, in effect making the program - proprietary. To prevent this, we have made it clear that any patent must - be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and - modification follow. - - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains a - notice placed by the copyright holder saying it may be distributed under - the terms of this General Public License. The "Program", below, refers - to any such program or work, and a "work based on the Program" means - either the Program or any derivative work under copyright law: that is - to say, a work containing the Program or a portion of it, either - verbatim or with modifications and/or translated into another language. - (Hereinafter, translation is included without limitation in the term - "modification".) Each licensee is addressed as "you". - - Activities other than copying, distribution and modification are not - covered by this License; they are outside its scope. The act of running - the Program is not restricted, and the output from the Program is - covered only if its contents constitute a work based on the Program - (independent of having been made by running the Program). Whether that - is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's source - code as you receive it, in any medium, provided that you conspicuously - and appropriately publish on each copy an appropriate copyright notice - and disclaimer of warranty; keep intact all the notices that refer to - this License and to the absence of any warranty; and give any other - recipients of the Program a copy of this License along with the Program. - - You may charge a fee for the physical act of transferring a copy, and - you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion of - it, thus forming a work based on the Program, and copy and distribute - such modifications or work under the terms of Section 1 above, provided - that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any part - thereof, to be licensed as a whole at no charge to all third parties - under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a notice - that there is no warranty (or else, saying that you provide a - warranty) and that users may redistribute the program under these - conditions, and telling the user how to view a copy of this License. - (Exception: if the Program itself is interactive but does not - normally print such an announcement, your work based on the Program - is not required to print an announcement.) - - These requirements apply to the modified work as a whole. If - identifiable sections of that work are not derived from the Program, and - can be reasonably considered independent and separate works in - themselves, then this License, and its terms, do not apply to those - sections when you distribute them as separate works. But when you - distribute the same sections as part of a whole which is a work based on - the Program, the distribution of the whole must be on the terms of this - License, whose permissions for other licensees extend to the entire - whole, and thus to each and every part regardless of who wrote it. - - Thus, it is not the intent of this section to claim rights or contest - your rights to work written entirely by you; rather, the intent is to - exercise the right to control the distribution of derivative or - collective works based on the Program. - - In addition, mere aggregation of another work not based on the Program - with the Program (or with a work based on the Program) on a volume of a - storage or distribution medium does not bring the other work under the - scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, - under Section 2) in object code or executable form under the terms of - Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your cost - of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed - only for noncommercial distribution and only if you received the - program in object code or executable form with such an offer, in - accord with Subsection b above.) - - The source code for a work means the preferred form of the work for - making modifications to it. For an executable work, complete source code - means all the source code for all modules it contains, plus any - associated interface definition files, plus the scripts used to control - compilation and installation of the executable. However, as a special - exception, the source code distributed need not include anything that is - normally distributed (in either source or binary form) with the major - components (compiler, kernel, and so on) of the operating system on - which the executable runs, unless that component itself accompanies the - executable. - - If distribution of executable or object code is made by offering access - to copy from a designated place, then offering equivalent access to copy - the source code from the same place counts as distribution of the source - code, even though third parties are not compelled to copy the source - along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program - except as expressly provided under this License. Any attempt otherwise - to copy, modify, sublicense or distribute the Program is void, and will - automatically terminate your rights under this License. However, parties - who have received copies, or rights, from you under this License will - not have their licenses terminated so long as such parties remain in - full compliance. - - 5. You are not required to accept this License, since you have not - signed it. However, nothing else grants you permission to modify or - distribute the Program or its derivative works. These actions are - prohibited by law if you do not accept this License. Therefore, by - modifying or distributing the Program (or any work based on the - Program), you indicate your acceptance of this License to do so, and all - its terms and conditions for copying, distributing or modifying the - Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the - Program), the recipient automatically receives a license from the - original licensor to copy, distribute or modify the Program subject to - these terms and conditions. You may not impose any further restrictions - on the recipients' exercise of the rights granted herein. You are not - responsible for enforcing compliance by third parties to this License. - - 7. If, as a consequence of a court judgment or allegation of patent - infringement or for any other reason (not limited to patent issues), - conditions are imposed on you (whether by court order, agreement or - otherwise) that contradict the conditions of this License, they do not - excuse you from the conditions of this License. If you cannot distribute - so as to satisfy simultaneously your obligations under this License and - any other pertinent obligations, then as a consequence you may not - distribute the Program at all. For example, if a patent license would - not permit royalty-free redistribution of the Program by all those who - receive copies directly or indirectly through you, then the only way you - could satisfy both it and this License would be to refrain entirely from - distribution of the Program. - - If any portion of this section is held invalid or unenforceable under - any particular circumstance, the balance of the section is intended to - apply and the section as a whole is intended to apply in other - circumstances. - - It is not the purpose of this section to induce you to infringe any - patents or other property right claims or to contest validity of any - such claims; this section has the sole purpose of protecting the - integrity of the free software distribution system, which is implemented - by public license practices. Many people have made generous - contributions to the wide range of software distributed through that - system in reliance on consistent application of that system; it is up to - the author/donor to decide if he or she is willing to distribute - software through any other system and a licensee cannot impose that choice. - - This section is intended to make thoroughly clear what is believed to be - a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in - certain countries either by patents or by copyrighted interfaces, the - original copyright holder who places the Program under this License may - add an explicit geographical distribution limitation excluding those - countries, so that distribution is permitted only in or among countries - not thus excluded. In such case, this License incorporates the - limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new - versions of the 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 Program - specifies a version number of this License which applies to it and "any - later version", you have the option of following the terms and - conditions either of that version or of any later version published by - the Free Software Foundation. If the Program does not specify a version - number of this License, you may choose any version ever published by the - Free Software Foundation. - - 10. If you wish to incorporate parts of the Program into other free - programs whose distribution conditions are different, write to the - author to ask for permission. For software which is copyrighted by the - Free Software Foundation, write to the Free Software Foundation; we - sometimes make exceptions for this. Our decision will be guided by the - two goals of preserving the free status of all derivatives of our free - software and of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO - WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. - EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR - OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, - EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE - ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH - YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL - NECESSARY SERVICING, REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN - WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY - AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR - DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL - DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM - (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED - INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF - THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR - OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest - possible use to the public, the best way to achieve this is to make it - free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest to - attach them to the start of each source file to most effectively convey - the exclusion of warranty; and each file should have at least the - "copyright" line and a pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA - - Also add information on how to contact you by electronic and paper mail. - - If the program is interactive, make it output a short notice like this - when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type - `show w'. This is free software, and you are welcome to redistribute - it under certain conditions; type `show c' for details. - - The hypothetical commands `show w' and `show c' should show the - appropriate parts of the General Public License. Of course, the commands - you use may be called something other than `show w' and `show c'; they - could even be mouse-clicks or menu items--whatever suits your program. - - You should also get your employer (if you work as a programmer) or your - school, if any, to sign a "copyright disclaimer" for the program, if - necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - program `Gnomovision' (which makes passes at compilers) written by - James Hacker. - - signature of Ty Coon, 1 April 1989 - Ty Coon, President of Vice - - This General Public License does not permit incorporating your program - into proprietary programs. If your program is a subroutine library, you - may consider it more useful to permit linking proprietary applications - with the library. If this is what you want to do, use the GNU Library - General Public License instead of this License. - ---- - -## CLASSPATH EXCEPTION - - Linking this library statically or dynamically with other modules is - making a combined work based on this library. Thus, the terms and - conditions of the GNU General Public License version 2 cover the whole - combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent - modules, and to copy and distribute the resulting executable under - terms of your choice, provided that you also meet, for each linked - independent module, the terms and conditions of the license of that - module. An independent module is a module which is not derived from or - based on this library. If you modify this library, you may extend this - exception to your version of the library, but you are not obligated to - do so. If you do not wish to do so, delete this exception statement - from your version. \ No newline at end of file diff --git a/material/licenses/collector/LICENSE-org.eclipse.persistence.asm.txt b/material/licenses/collector/LICENSE-org.eclipse.persistence.asm.txt deleted file mode 100644 index 3b7ae66064..0000000000 --- a/material/licenses/collector/LICENSE-org.eclipse.persistence.asm.txt +++ /dev/null @@ -1,637 +0,0 @@ -# Eclipse Public License - v 2.0 - - THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE - PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION - OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - - 1. DEFINITIONS - - "Contribution" means: - - a) in the case of the initial Contributor, the initial content - Distributed under this Agreement, and - - b) in the case of each subsequent Contributor: - i) changes to the Program, and - ii) additions to the Program; - where such changes and/or additions to the Program originate from - and are Distributed by that particular Contributor. A Contribution - "originates" from a Contributor if it was added to the Program by - such Contributor itself or anyone acting on such Contributor's behalf. - Contributions do not include changes or additions to the Program that - are not Modified Works. - - "Contributor" means any person or entity that Distributes the Program. - - "Licensed Patents" mean patent claims licensable by a Contributor which - are necessarily infringed by the use or sale of its Contribution alone - or when combined with the Program. - - "Program" means the Contributions Distributed in accordance with this - Agreement. - - "Recipient" means anyone who receives the Program under this Agreement - or any Secondary License (as applicable), including Contributors. - - "Derivative Works" shall mean any work, whether in Source Code or other - form, that is based on (or derived from) the Program and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. - - "Modified Works" shall mean any work in Source Code or other form that - results from an addition to, deletion from, or modification of the - contents of the Program, including, for purposes of clarity any new file - in Source Code form that contains any contents of the Program. Modified - Works shall not include works that contain only declarations, - interfaces, types, classes, structures, or files of the Program solely - in each case in order to link to, bind by name, or subclass the Program - or Modified Works thereof. - - "Distribute" means the acts of a) distributing or b) making available - in any manner that enables the transfer of a copy. - - "Source Code" means the form of a Program preferred for making - modifications, including but not limited to software source code, - documentation source, and configuration files. - - "Secondary License" means either the GNU General Public License, - Version 2.0, or any later versions of that license, including any - exceptions or additional permissions as identified by the initial - Contributor. - - 2. GRANT OF RIGHTS - - a) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free copyright - license to reproduce, prepare Derivative Works of, publicly display, - publicly perform, Distribute and sublicense the Contribution of such - Contributor, if any, and such Derivative Works. - - b) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free patent - license under Licensed Patents to make, use, sell, offer to sell, - import and otherwise transfer the Contribution of such Contributor, - if any, in Source Code or other form. This patent license shall - apply to the combination of the Contribution and the Program if, at - the time the Contribution is added by the Contributor, such addition - of the Contribution causes such combination to be covered by the - Licensed Patents. The patent license shall not apply to any other - combinations which include the Contribution. No hardware per se is - licensed hereunder. - - c) Recipient understands that although each Contributor grants the - licenses to its Contributions set forth herein, no assurances are - provided by any Contributor that the Program does not infringe the - patent or other intellectual property rights of any other entity. - Each Contributor disclaims any liability to Recipient for claims - brought by any other entity based on infringement of intellectual - property rights or otherwise. As a condition to exercising the - rights and licenses granted hereunder, each Recipient hereby - assumes sole responsibility to secure any other intellectual - property rights needed, if any. For example, if a third party - patent license is required to allow Recipient to Distribute the - Program, it is Recipient's responsibility to acquire that license - before distributing the Program. - - d) Each Contributor represents that to its knowledge it has - sufficient copyright rights in its Contribution, if any, to grant - the copyright license set forth in this Agreement. - - e) Notwithstanding the terms of any Secondary License, no - Contributor makes additional grants to any Recipient (other than - those set forth in this Agreement) as a result of such Recipient's - receipt of the Program under the terms of a Secondary License - (if permitted under the terms of Section 3). - - 3. REQUIREMENTS - - 3.1 If a Contributor Distributes the Program in any form, then: - - a) the Program must also be made available as Source Code, in - accordance with section 3.2, and the Contributor must accompany - the Program with a statement that the Source Code for the Program - is available under this Agreement, and informs Recipients how to - obtain it in a reasonable manner on or through a medium customarily - used for software exchange; and - - b) the Contributor may Distribute the Program under a license - different than this Agreement, provided that such license: - i) effectively disclaims on behalf of all other Contributors all - warranties and conditions, express and implied, including - warranties or conditions of title and non-infringement, and - implied warranties or conditions of merchantability and fitness - for a particular purpose; - - ii) effectively excludes on behalf of all other Contributors all - liability for damages, including direct, indirect, special, - incidental and consequential damages, such as lost profits; - - iii) does not attempt to limit or alter the recipients' rights - in the Source Code under section 3.2; and - - iv) requires any subsequent distribution of the Program by any - party to be under a license that satisfies the requirements - of this section 3. - - 3.2 When the Program is Distributed as Source Code: - - a) it must be made available under this Agreement, or if the - Program (i) is combined with other material in a separate file or - files made available under a Secondary License, and (ii) the initial - Contributor attached to the Source Code the notice described in - Exhibit A of this Agreement, then the Program may be made available - under the terms of such Secondary Licenses, and - - b) a copy of this Agreement must be included with each copy of - the Program. - - 3.3 Contributors may not remove or alter any copyright, patent, - trademark, attribution notices, disclaimers of warranty, or limitations - of liability ("notices") contained within the Program from any copy of - the Program which they Distribute, provided that Contributors may add - their own appropriate notices. - - 4. COMMERCIAL DISTRIBUTION - - Commercial distributors of software may accept certain responsibilities - with respect to end users, business partners and the like. While this - license is intended to facilitate the commercial use of the Program, - the Contributor who includes the Program in a commercial product - offering should do so in a manner which does not create potential - liability for other Contributors. Therefore, if a Contributor includes - the Program in a commercial product offering, such Contributor - ("Commercial Contributor") hereby agrees to defend and indemnify every - other Contributor ("Indemnified Contributor") against any losses, - damages and costs (collectively "Losses") arising from claims, lawsuits - and other legal actions brought by a third party against the Indemnified - Contributor to the extent caused by the acts or omissions of such - Commercial Contributor in connection with its distribution of the Program - in a commercial product offering. The obligations in this section do not - apply to any claims or Losses relating to any actual or alleged - intellectual property infringement. In order to qualify, an Indemnified - Contributor must: a) promptly notify the Commercial Contributor in - writing of such claim, and b) allow the Commercial Contributor to control, - and cooperate with the Commercial Contributor in, the defense and any - related settlement negotiations. The Indemnified Contributor may - participate in any such claim at its own expense. - - For example, a Contributor might include the Program in a commercial - product offering, Product X. That Contributor is then a Commercial - Contributor. If that Commercial Contributor then makes performance - claims, or offers warranties related to Product X, those performance - claims and warranties are such Commercial Contributor's responsibility - alone. Under this section, the Commercial Contributor would have to - defend claims against the other Contributors related to those performance - claims and warranties, and if a court requires any other Contributor to - pay any damages as a result, the Commercial Contributor must pay - those damages. - - 5. NO WARRANTY - - EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT - PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS" - BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR - IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF - TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR - PURPOSE. Each Recipient is solely responsible for determining the - appropriateness of using and distributing the Program and assumes all - risks associated with its exercise of rights under this Agreement, - including but not limited to the risks and costs of program errors, - compliance with applicable laws, damage to or loss of data, programs - or equipment, and unavailability or interruption of operations. - - 6. DISCLAIMER OF LIABILITY - - EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT - PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS - SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST - PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE - EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGES. - - 7. GENERAL - - If any provision of this Agreement is invalid or unenforceable under - applicable law, it shall not affect the validity or enforceability of - the remainder of the terms of this Agreement, and without further - action by the parties hereto, such provision shall be reformed to the - minimum extent necessary to make such provision valid and enforceable. - - If Recipient institutes patent litigation against any entity - (including a cross-claim or counterclaim in a lawsuit) alleging that the - Program itself (excluding combinations of the Program with other software - or hardware) infringes such Recipient's patent(s), then such Recipient's - rights granted under Section 2(b) shall terminate as of the date such - litigation is filed. - - All Recipient's rights under this Agreement shall terminate if it - fails to comply with any of the material terms or conditions of this - Agreement and does not cure such failure in a reasonable period of - time after becoming aware of such noncompliance. If all Recipient's - rights under this Agreement terminate, Recipient agrees to cease use - and distribution of the Program as soon as reasonably practicable. - However, Recipient's obligations under this Agreement and any licenses - granted by Recipient relating to the Program shall continue and survive. - - Everyone is permitted to copy and distribute copies of this Agreement, - but in order to avoid inconsistency the Agreement is copyrighted and - may only be modified in the following manner. The Agreement Steward - reserves the right to publish new versions (including revisions) of - this Agreement from time to time. No one other than the Agreement - Steward has the right to modify this Agreement. The Eclipse Foundation - is the initial Agreement Steward. The Eclipse Foundation may assign the - responsibility to serve as the Agreement Steward to a suitable separate - entity. Each new version of the Agreement will be given a distinguishing - version number. The Program (including Contributions) may always be - Distributed subject to the version of the Agreement under which it was - received. In addition, after a new version of the Agreement is published, - Contributor may elect to Distribute the Program (including its - Contributions) under the new version. - - Except as expressly stated in Sections 2(a) and 2(b) above, Recipient - receives no rights or licenses to the intellectual property of any - Contributor under this Agreement, whether expressly, by implication, - estoppel or otherwise. All rights in the Program not expressly granted - under this Agreement are reserved. Nothing in this Agreement is intended - to be enforceable by any entity that is not a Contributor or Recipient. - No third-party beneficiary rights are created under this Agreement. - - Exhibit A - Form of Secondary Licenses Notice - - "This Source Code may also be made available under the following - Secondary Licenses when the conditions for such availability set forth - in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), - version(s), and exceptions or additional permissions here}." - - Simply including a copy of this Agreement, including this Exhibit A - is not sufficient to license the Source Code under Secondary Licenses. - - If it is not possible or desirable to put the notice in a particular - file, then You may include the notice in a location (such as a LICENSE - file in a relevant directory) where a recipient would be likely to - look for such a notice. - - You may add additional accurate notices of copyright ownership. - ---- - -## The GNU General Public License (GPL) Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor - Boston, MA 02110-1335 - USA - - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your freedom to - share and change it. By contrast, the GNU General Public License is - intended to guarantee your freedom to share and change free software--to - make sure the software is free for all its users. This General Public - License applies to most of the Free Software Foundation's software and - to any other program whose authors commit to using it. (Some other Free - Software Foundation software is covered by the GNU Library General - Public License instead.) You can apply it to your programs, too. - - When we speak of free software, we are referring to freedom, not price. - Our General Public Licenses are designed to make sure that you have the - freedom to distribute copies of free software (and charge for this - service if you wish), that you receive source code or can get it if you - want it, that you can change the software or use pieces of it in new - free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid anyone - to deny you these rights or to ask you to surrender the rights. These - restrictions translate to certain responsibilities for you if you - distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether gratis - or for a fee, you must give the recipients all the rights that you have. - You must make sure that they, too, receive or can get the source code. - And you must show them these terms so they know their rights. - - We protect your rights with two steps: (1) copyright the software, and - (2) offer you this license which gives you legal permission to copy, - distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain - that everyone understands that there is no warranty for this free - software. If the software is modified by someone else and passed on, we - want its recipients to know that what they have is not the original, so - that any problems introduced by others will not reflect on the original - authors' reputations. - - Finally, any free program is threatened constantly by software patents. - We wish to avoid the danger that redistributors of a free program will - individually obtain patent licenses, in effect making the program - proprietary. To prevent this, we have made it clear that any patent must - be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and - modification follow. - - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains a - notice placed by the copyright holder saying it may be distributed under - the terms of this General Public License. The "Program", below, refers - to any such program or work, and a "work based on the Program" means - either the Program or any derivative work under copyright law: that is - to say, a work containing the Program or a portion of it, either - verbatim or with modifications and/or translated into another language. - (Hereinafter, translation is included without limitation in the term - "modification".) Each licensee is addressed as "you". - - Activities other than copying, distribution and modification are not - covered by this License; they are outside its scope. The act of running - the Program is not restricted, and the output from the Program is - covered only if its contents constitute a work based on the Program - (independent of having been made by running the Program). Whether that - is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's source - code as you receive it, in any medium, provided that you conspicuously - and appropriately publish on each copy an appropriate copyright notice - and disclaimer of warranty; keep intact all the notices that refer to - this License and to the absence of any warranty; and give any other - recipients of the Program a copy of this License along with the Program. - - You may charge a fee for the physical act of transferring a copy, and - you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion of - it, thus forming a work based on the Program, and copy and distribute - such modifications or work under the terms of Section 1 above, provided - that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any part - thereof, to be licensed as a whole at no charge to all third parties - under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a notice - that there is no warranty (or else, saying that you provide a - warranty) and that users may redistribute the program under these - conditions, and telling the user how to view a copy of this License. - (Exception: if the Program itself is interactive but does not - normally print such an announcement, your work based on the Program - is not required to print an announcement.) - - These requirements apply to the modified work as a whole. If - identifiable sections of that work are not derived from the Program, and - can be reasonably considered independent and separate works in - themselves, then this License, and its terms, do not apply to those - sections when you distribute them as separate works. But when you - distribute the same sections as part of a whole which is a work based on - the Program, the distribution of the whole must be on the terms of this - License, whose permissions for other licensees extend to the entire - whole, and thus to each and every part regardless of who wrote it. - - Thus, it is not the intent of this section to claim rights or contest - your rights to work written entirely by you; rather, the intent is to - exercise the right to control the distribution of derivative or - collective works based on the Program. - - In addition, mere aggregation of another work not based on the Program - with the Program (or with a work based on the Program) on a volume of a - storage or distribution medium does not bring the other work under the - scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, - under Section 2) in object code or executable form under the terms of - Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your cost - of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed - only for noncommercial distribution and only if you received the - program in object code or executable form with such an offer, in - accord with Subsection b above.) - - The source code for a work means the preferred form of the work for - making modifications to it. For an executable work, complete source code - means all the source code for all modules it contains, plus any - associated interface definition files, plus the scripts used to control - compilation and installation of the executable. However, as a special - exception, the source code distributed need not include anything that is - normally distributed (in either source or binary form) with the major - components (compiler, kernel, and so on) of the operating system on - which the executable runs, unless that component itself accompanies the - executable. - - If distribution of executable or object code is made by offering access - to copy from a designated place, then offering equivalent access to copy - the source code from the same place counts as distribution of the source - code, even though third parties are not compelled to copy the source - along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program - except as expressly provided under this License. Any attempt otherwise - to copy, modify, sublicense or distribute the Program is void, and will - automatically terminate your rights under this License. However, parties - who have received copies, or rights, from you under this License will - not have their licenses terminated so long as such parties remain in - full compliance. - - 5. You are not required to accept this License, since you have not - signed it. However, nothing else grants you permission to modify or - distribute the Program or its derivative works. These actions are - prohibited by law if you do not accept this License. Therefore, by - modifying or distributing the Program (or any work based on the - Program), you indicate your acceptance of this License to do so, and all - its terms and conditions for copying, distributing or modifying the - Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the - Program), the recipient automatically receives a license from the - original licensor to copy, distribute or modify the Program subject to - these terms and conditions. You may not impose any further restrictions - on the recipients' exercise of the rights granted herein. You are not - responsible for enforcing compliance by third parties to this License. - - 7. If, as a consequence of a court judgment or allegation of patent - infringement or for any other reason (not limited to patent issues), - conditions are imposed on you (whether by court order, agreement or - otherwise) that contradict the conditions of this License, they do not - excuse you from the conditions of this License. If you cannot distribute - so as to satisfy simultaneously your obligations under this License and - any other pertinent obligations, then as a consequence you may not - distribute the Program at all. For example, if a patent license would - not permit royalty-free redistribution of the Program by all those who - receive copies directly or indirectly through you, then the only way you - could satisfy both it and this License would be to refrain entirely from - distribution of the Program. - - If any portion of this section is held invalid or unenforceable under - any particular circumstance, the balance of the section is intended to - apply and the section as a whole is intended to apply in other - circumstances. - - It is not the purpose of this section to induce you to infringe any - patents or other property right claims or to contest validity of any - such claims; this section has the sole purpose of protecting the - integrity of the free software distribution system, which is implemented - by public license practices. Many people have made generous - contributions to the wide range of software distributed through that - system in reliance on consistent application of that system; it is up to - the author/donor to decide if he or she is willing to distribute - software through any other system and a licensee cannot impose that choice. - - This section is intended to make thoroughly clear what is believed to be - a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in - certain countries either by patents or by copyrighted interfaces, the - original copyright holder who places the Program under this License may - add an explicit geographical distribution limitation excluding those - countries, so that distribution is permitted only in or among countries - not thus excluded. In such case, this License incorporates the - limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new - versions of the 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 Program - specifies a version number of this License which applies to it and "any - later version", you have the option of following the terms and - conditions either of that version or of any later version published by - the Free Software Foundation. If the Program does not specify a version - number of this License, you may choose any version ever published by the - Free Software Foundation. - - 10. If you wish to incorporate parts of the Program into other free - programs whose distribution conditions are different, write to the - author to ask for permission. For software which is copyrighted by the - Free Software Foundation, write to the Free Software Foundation; we - sometimes make exceptions for this. Our decision will be guided by the - two goals of preserving the free status of all derivatives of our free - software and of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO - WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. - EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR - OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, - EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE - ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH - YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL - NECESSARY SERVICING, REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN - WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY - AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR - DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL - DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM - (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED - INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF - THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR - OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest - possible use to the public, the best way to achieve this is to make it - free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest to - attach them to the start of each source file to most effectively convey - the exclusion of warranty; and each file should have at least the - "copyright" line and a pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA - - Also add information on how to contact you by electronic and paper mail. - - If the program is interactive, make it output a short notice like this - when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type - `show w'. This is free software, and you are welcome to redistribute - it under certain conditions; type `show c' for details. - - The hypothetical commands `show w' and `show c' should show the - appropriate parts of the General Public License. Of course, the commands - you use may be called something other than `show w' and `show c'; they - could even be mouse-clicks or menu items--whatever suits your program. - - You should also get your employer (if you work as a programmer) or your - school, if any, to sign a "copyright disclaimer" for the program, if - necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - program `Gnomovision' (which makes passes at compilers) written by - James Hacker. - - signature of Ty Coon, 1 April 1989 - Ty Coon, President of Vice - - This General Public License does not permit incorporating your program - into proprietary programs. If your program is a subroutine library, you - may consider it more useful to permit linking proprietary applications - with the library. If this is what you want to do, use the GNU Library - General Public License instead of this License. - ---- - -## CLASSPATH EXCEPTION - - Linking this library statically or dynamically with other modules is - making a combined work based on this library. Thus, the terms and - conditions of the GNU General Public License version 2 cover the whole - combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent - modules, and to copy and distribute the resulting executable under - terms of your choice, provided that you also meet, for each linked - independent module, the terms and conditions of the license of that - module. An independent module is a module which is not derived from or - based on this library. If you modify this library, you may extend this - exception to your version of the library, but you are not obligated to - do so. If you do not wish to do so, delete this exception statement - from your version. \ No newline at end of file diff --git a/material/licenses/collector/LICENSE-org.eclipse.persistence.core.txt b/material/licenses/collector/LICENSE-org.eclipse.persistence.core.txt deleted file mode 100644 index 3b7ae66064..0000000000 --- a/material/licenses/collector/LICENSE-org.eclipse.persistence.core.txt +++ /dev/null @@ -1,637 +0,0 @@ -# Eclipse Public License - v 2.0 - - THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE - PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION - OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - - 1. DEFINITIONS - - "Contribution" means: - - a) in the case of the initial Contributor, the initial content - Distributed under this Agreement, and - - b) in the case of each subsequent Contributor: - i) changes to the Program, and - ii) additions to the Program; - where such changes and/or additions to the Program originate from - and are Distributed by that particular Contributor. A Contribution - "originates" from a Contributor if it was added to the Program by - such Contributor itself or anyone acting on such Contributor's behalf. - Contributions do not include changes or additions to the Program that - are not Modified Works. - - "Contributor" means any person or entity that Distributes the Program. - - "Licensed Patents" mean patent claims licensable by a Contributor which - are necessarily infringed by the use or sale of its Contribution alone - or when combined with the Program. - - "Program" means the Contributions Distributed in accordance with this - Agreement. - - "Recipient" means anyone who receives the Program under this Agreement - or any Secondary License (as applicable), including Contributors. - - "Derivative Works" shall mean any work, whether in Source Code or other - form, that is based on (or derived from) the Program and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. - - "Modified Works" shall mean any work in Source Code or other form that - results from an addition to, deletion from, or modification of the - contents of the Program, including, for purposes of clarity any new file - in Source Code form that contains any contents of the Program. Modified - Works shall not include works that contain only declarations, - interfaces, types, classes, structures, or files of the Program solely - in each case in order to link to, bind by name, or subclass the Program - or Modified Works thereof. - - "Distribute" means the acts of a) distributing or b) making available - in any manner that enables the transfer of a copy. - - "Source Code" means the form of a Program preferred for making - modifications, including but not limited to software source code, - documentation source, and configuration files. - - "Secondary License" means either the GNU General Public License, - Version 2.0, or any later versions of that license, including any - exceptions or additional permissions as identified by the initial - Contributor. - - 2. GRANT OF RIGHTS - - a) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free copyright - license to reproduce, prepare Derivative Works of, publicly display, - publicly perform, Distribute and sublicense the Contribution of such - Contributor, if any, and such Derivative Works. - - b) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free patent - license under Licensed Patents to make, use, sell, offer to sell, - import and otherwise transfer the Contribution of such Contributor, - if any, in Source Code or other form. This patent license shall - apply to the combination of the Contribution and the Program if, at - the time the Contribution is added by the Contributor, such addition - of the Contribution causes such combination to be covered by the - Licensed Patents. The patent license shall not apply to any other - combinations which include the Contribution. No hardware per se is - licensed hereunder. - - c) Recipient understands that although each Contributor grants the - licenses to its Contributions set forth herein, no assurances are - provided by any Contributor that the Program does not infringe the - patent or other intellectual property rights of any other entity. - Each Contributor disclaims any liability to Recipient for claims - brought by any other entity based on infringement of intellectual - property rights or otherwise. As a condition to exercising the - rights and licenses granted hereunder, each Recipient hereby - assumes sole responsibility to secure any other intellectual - property rights needed, if any. For example, if a third party - patent license is required to allow Recipient to Distribute the - Program, it is Recipient's responsibility to acquire that license - before distributing the Program. - - d) Each Contributor represents that to its knowledge it has - sufficient copyright rights in its Contribution, if any, to grant - the copyright license set forth in this Agreement. - - e) Notwithstanding the terms of any Secondary License, no - Contributor makes additional grants to any Recipient (other than - those set forth in this Agreement) as a result of such Recipient's - receipt of the Program under the terms of a Secondary License - (if permitted under the terms of Section 3). - - 3. REQUIREMENTS - - 3.1 If a Contributor Distributes the Program in any form, then: - - a) the Program must also be made available as Source Code, in - accordance with section 3.2, and the Contributor must accompany - the Program with a statement that the Source Code for the Program - is available under this Agreement, and informs Recipients how to - obtain it in a reasonable manner on or through a medium customarily - used for software exchange; and - - b) the Contributor may Distribute the Program under a license - different than this Agreement, provided that such license: - i) effectively disclaims on behalf of all other Contributors all - warranties and conditions, express and implied, including - warranties or conditions of title and non-infringement, and - implied warranties or conditions of merchantability and fitness - for a particular purpose; - - ii) effectively excludes on behalf of all other Contributors all - liability for damages, including direct, indirect, special, - incidental and consequential damages, such as lost profits; - - iii) does not attempt to limit or alter the recipients' rights - in the Source Code under section 3.2; and - - iv) requires any subsequent distribution of the Program by any - party to be under a license that satisfies the requirements - of this section 3. - - 3.2 When the Program is Distributed as Source Code: - - a) it must be made available under this Agreement, or if the - Program (i) is combined with other material in a separate file or - files made available under a Secondary License, and (ii) the initial - Contributor attached to the Source Code the notice described in - Exhibit A of this Agreement, then the Program may be made available - under the terms of such Secondary Licenses, and - - b) a copy of this Agreement must be included with each copy of - the Program. - - 3.3 Contributors may not remove or alter any copyright, patent, - trademark, attribution notices, disclaimers of warranty, or limitations - of liability ("notices") contained within the Program from any copy of - the Program which they Distribute, provided that Contributors may add - their own appropriate notices. - - 4. COMMERCIAL DISTRIBUTION - - Commercial distributors of software may accept certain responsibilities - with respect to end users, business partners and the like. While this - license is intended to facilitate the commercial use of the Program, - the Contributor who includes the Program in a commercial product - offering should do so in a manner which does not create potential - liability for other Contributors. Therefore, if a Contributor includes - the Program in a commercial product offering, such Contributor - ("Commercial Contributor") hereby agrees to defend and indemnify every - other Contributor ("Indemnified Contributor") against any losses, - damages and costs (collectively "Losses") arising from claims, lawsuits - and other legal actions brought by a third party against the Indemnified - Contributor to the extent caused by the acts or omissions of such - Commercial Contributor in connection with its distribution of the Program - in a commercial product offering. The obligations in this section do not - apply to any claims or Losses relating to any actual or alleged - intellectual property infringement. In order to qualify, an Indemnified - Contributor must: a) promptly notify the Commercial Contributor in - writing of such claim, and b) allow the Commercial Contributor to control, - and cooperate with the Commercial Contributor in, the defense and any - related settlement negotiations. The Indemnified Contributor may - participate in any such claim at its own expense. - - For example, a Contributor might include the Program in a commercial - product offering, Product X. That Contributor is then a Commercial - Contributor. If that Commercial Contributor then makes performance - claims, or offers warranties related to Product X, those performance - claims and warranties are such Commercial Contributor's responsibility - alone. Under this section, the Commercial Contributor would have to - defend claims against the other Contributors related to those performance - claims and warranties, and if a court requires any other Contributor to - pay any damages as a result, the Commercial Contributor must pay - those damages. - - 5. NO WARRANTY - - EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT - PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS" - BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR - IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF - TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR - PURPOSE. Each Recipient is solely responsible for determining the - appropriateness of using and distributing the Program and assumes all - risks associated with its exercise of rights under this Agreement, - including but not limited to the risks and costs of program errors, - compliance with applicable laws, damage to or loss of data, programs - or equipment, and unavailability or interruption of operations. - - 6. DISCLAIMER OF LIABILITY - - EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT - PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS - SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST - PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE - EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGES. - - 7. GENERAL - - If any provision of this Agreement is invalid or unenforceable under - applicable law, it shall not affect the validity or enforceability of - the remainder of the terms of this Agreement, and without further - action by the parties hereto, such provision shall be reformed to the - minimum extent necessary to make such provision valid and enforceable. - - If Recipient institutes patent litigation against any entity - (including a cross-claim or counterclaim in a lawsuit) alleging that the - Program itself (excluding combinations of the Program with other software - or hardware) infringes such Recipient's patent(s), then such Recipient's - rights granted under Section 2(b) shall terminate as of the date such - litigation is filed. - - All Recipient's rights under this Agreement shall terminate if it - fails to comply with any of the material terms or conditions of this - Agreement and does not cure such failure in a reasonable period of - time after becoming aware of such noncompliance. If all Recipient's - rights under this Agreement terminate, Recipient agrees to cease use - and distribution of the Program as soon as reasonably practicable. - However, Recipient's obligations under this Agreement and any licenses - granted by Recipient relating to the Program shall continue and survive. - - Everyone is permitted to copy and distribute copies of this Agreement, - but in order to avoid inconsistency the Agreement is copyrighted and - may only be modified in the following manner. The Agreement Steward - reserves the right to publish new versions (including revisions) of - this Agreement from time to time. No one other than the Agreement - Steward has the right to modify this Agreement. The Eclipse Foundation - is the initial Agreement Steward. The Eclipse Foundation may assign the - responsibility to serve as the Agreement Steward to a suitable separate - entity. Each new version of the Agreement will be given a distinguishing - version number. The Program (including Contributions) may always be - Distributed subject to the version of the Agreement under which it was - received. In addition, after a new version of the Agreement is published, - Contributor may elect to Distribute the Program (including its - Contributions) under the new version. - - Except as expressly stated in Sections 2(a) and 2(b) above, Recipient - receives no rights or licenses to the intellectual property of any - Contributor under this Agreement, whether expressly, by implication, - estoppel or otherwise. All rights in the Program not expressly granted - under this Agreement are reserved. Nothing in this Agreement is intended - to be enforceable by any entity that is not a Contributor or Recipient. - No third-party beneficiary rights are created under this Agreement. - - Exhibit A - Form of Secondary Licenses Notice - - "This Source Code may also be made available under the following - Secondary Licenses when the conditions for such availability set forth - in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), - version(s), and exceptions or additional permissions here}." - - Simply including a copy of this Agreement, including this Exhibit A - is not sufficient to license the Source Code under Secondary Licenses. - - If it is not possible or desirable to put the notice in a particular - file, then You may include the notice in a location (such as a LICENSE - file in a relevant directory) where a recipient would be likely to - look for such a notice. - - You may add additional accurate notices of copyright ownership. - ---- - -## The GNU General Public License (GPL) Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor - Boston, MA 02110-1335 - USA - - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your freedom to - share and change it. By contrast, the GNU General Public License is - intended to guarantee your freedom to share and change free software--to - make sure the software is free for all its users. This General Public - License applies to most of the Free Software Foundation's software and - to any other program whose authors commit to using it. (Some other Free - Software Foundation software is covered by the GNU Library General - Public License instead.) You can apply it to your programs, too. - - When we speak of free software, we are referring to freedom, not price. - Our General Public Licenses are designed to make sure that you have the - freedom to distribute copies of free software (and charge for this - service if you wish), that you receive source code or can get it if you - want it, that you can change the software or use pieces of it in new - free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid anyone - to deny you these rights or to ask you to surrender the rights. These - restrictions translate to certain responsibilities for you if you - distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether gratis - or for a fee, you must give the recipients all the rights that you have. - You must make sure that they, too, receive or can get the source code. - And you must show them these terms so they know their rights. - - We protect your rights with two steps: (1) copyright the software, and - (2) offer you this license which gives you legal permission to copy, - distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain - that everyone understands that there is no warranty for this free - software. If the software is modified by someone else and passed on, we - want its recipients to know that what they have is not the original, so - that any problems introduced by others will not reflect on the original - authors' reputations. - - Finally, any free program is threatened constantly by software patents. - We wish to avoid the danger that redistributors of a free program will - individually obtain patent licenses, in effect making the program - proprietary. To prevent this, we have made it clear that any patent must - be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and - modification follow. - - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains a - notice placed by the copyright holder saying it may be distributed under - the terms of this General Public License. The "Program", below, refers - to any such program or work, and a "work based on the Program" means - either the Program or any derivative work under copyright law: that is - to say, a work containing the Program or a portion of it, either - verbatim or with modifications and/or translated into another language. - (Hereinafter, translation is included without limitation in the term - "modification".) Each licensee is addressed as "you". - - Activities other than copying, distribution and modification are not - covered by this License; they are outside its scope. The act of running - the Program is not restricted, and the output from the Program is - covered only if its contents constitute a work based on the Program - (independent of having been made by running the Program). Whether that - is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's source - code as you receive it, in any medium, provided that you conspicuously - and appropriately publish on each copy an appropriate copyright notice - and disclaimer of warranty; keep intact all the notices that refer to - this License and to the absence of any warranty; and give any other - recipients of the Program a copy of this License along with the Program. - - You may charge a fee for the physical act of transferring a copy, and - you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion of - it, thus forming a work based on the Program, and copy and distribute - such modifications or work under the terms of Section 1 above, provided - that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any part - thereof, to be licensed as a whole at no charge to all third parties - under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a notice - that there is no warranty (or else, saying that you provide a - warranty) and that users may redistribute the program under these - conditions, and telling the user how to view a copy of this License. - (Exception: if the Program itself is interactive but does not - normally print such an announcement, your work based on the Program - is not required to print an announcement.) - - These requirements apply to the modified work as a whole. If - identifiable sections of that work are not derived from the Program, and - can be reasonably considered independent and separate works in - themselves, then this License, and its terms, do not apply to those - sections when you distribute them as separate works. But when you - distribute the same sections as part of a whole which is a work based on - the Program, the distribution of the whole must be on the terms of this - License, whose permissions for other licensees extend to the entire - whole, and thus to each and every part regardless of who wrote it. - - Thus, it is not the intent of this section to claim rights or contest - your rights to work written entirely by you; rather, the intent is to - exercise the right to control the distribution of derivative or - collective works based on the Program. - - In addition, mere aggregation of another work not based on the Program - with the Program (or with a work based on the Program) on a volume of a - storage or distribution medium does not bring the other work under the - scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, - under Section 2) in object code or executable form under the terms of - Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your cost - of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed - only for noncommercial distribution and only if you received the - program in object code or executable form with such an offer, in - accord with Subsection b above.) - - The source code for a work means the preferred form of the work for - making modifications to it. For an executable work, complete source code - means all the source code for all modules it contains, plus any - associated interface definition files, plus the scripts used to control - compilation and installation of the executable. However, as a special - exception, the source code distributed need not include anything that is - normally distributed (in either source or binary form) with the major - components (compiler, kernel, and so on) of the operating system on - which the executable runs, unless that component itself accompanies the - executable. - - If distribution of executable or object code is made by offering access - to copy from a designated place, then offering equivalent access to copy - the source code from the same place counts as distribution of the source - code, even though third parties are not compelled to copy the source - along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program - except as expressly provided under this License. Any attempt otherwise - to copy, modify, sublicense or distribute the Program is void, and will - automatically terminate your rights under this License. However, parties - who have received copies, or rights, from you under this License will - not have their licenses terminated so long as such parties remain in - full compliance. - - 5. You are not required to accept this License, since you have not - signed it. However, nothing else grants you permission to modify or - distribute the Program or its derivative works. These actions are - prohibited by law if you do not accept this License. Therefore, by - modifying or distributing the Program (or any work based on the - Program), you indicate your acceptance of this License to do so, and all - its terms and conditions for copying, distributing or modifying the - Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the - Program), the recipient automatically receives a license from the - original licensor to copy, distribute or modify the Program subject to - these terms and conditions. You may not impose any further restrictions - on the recipients' exercise of the rights granted herein. You are not - responsible for enforcing compliance by third parties to this License. - - 7. If, as a consequence of a court judgment or allegation of patent - infringement or for any other reason (not limited to patent issues), - conditions are imposed on you (whether by court order, agreement or - otherwise) that contradict the conditions of this License, they do not - excuse you from the conditions of this License. If you cannot distribute - so as to satisfy simultaneously your obligations under this License and - any other pertinent obligations, then as a consequence you may not - distribute the Program at all. For example, if a patent license would - not permit royalty-free redistribution of the Program by all those who - receive copies directly or indirectly through you, then the only way you - could satisfy both it and this License would be to refrain entirely from - distribution of the Program. - - If any portion of this section is held invalid or unenforceable under - any particular circumstance, the balance of the section is intended to - apply and the section as a whole is intended to apply in other - circumstances. - - It is not the purpose of this section to induce you to infringe any - patents or other property right claims or to contest validity of any - such claims; this section has the sole purpose of protecting the - integrity of the free software distribution system, which is implemented - by public license practices. Many people have made generous - contributions to the wide range of software distributed through that - system in reliance on consistent application of that system; it is up to - the author/donor to decide if he or she is willing to distribute - software through any other system and a licensee cannot impose that choice. - - This section is intended to make thoroughly clear what is believed to be - a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in - certain countries either by patents or by copyrighted interfaces, the - original copyright holder who places the Program under this License may - add an explicit geographical distribution limitation excluding those - countries, so that distribution is permitted only in or among countries - not thus excluded. In such case, this License incorporates the - limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new - versions of the 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 Program - specifies a version number of this License which applies to it and "any - later version", you have the option of following the terms and - conditions either of that version or of any later version published by - the Free Software Foundation. If the Program does not specify a version - number of this License, you may choose any version ever published by the - Free Software Foundation. - - 10. If you wish to incorporate parts of the Program into other free - programs whose distribution conditions are different, write to the - author to ask for permission. For software which is copyrighted by the - Free Software Foundation, write to the Free Software Foundation; we - sometimes make exceptions for this. Our decision will be guided by the - two goals of preserving the free status of all derivatives of our free - software and of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO - WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. - EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR - OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, - EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE - ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH - YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL - NECESSARY SERVICING, REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN - WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY - AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR - DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL - DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM - (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED - INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF - THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR - OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest - possible use to the public, the best way to achieve this is to make it - free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest to - attach them to the start of each source file to most effectively convey - the exclusion of warranty; and each file should have at least the - "copyright" line and a pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA - - Also add information on how to contact you by electronic and paper mail. - - If the program is interactive, make it output a short notice like this - when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type - `show w'. This is free software, and you are welcome to redistribute - it under certain conditions; type `show c' for details. - - The hypothetical commands `show w' and `show c' should show the - appropriate parts of the General Public License. Of course, the commands - you use may be called something other than `show w' and `show c'; they - could even be mouse-clicks or menu items--whatever suits your program. - - You should also get your employer (if you work as a programmer) or your - school, if any, to sign a "copyright disclaimer" for the program, if - necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - program `Gnomovision' (which makes passes at compilers) written by - James Hacker. - - signature of Ty Coon, 1 April 1989 - Ty Coon, President of Vice - - This General Public License does not permit incorporating your program - into proprietary programs. If your program is a subroutine library, you - may consider it more useful to permit linking proprietary applications - with the library. If this is what you want to do, use the GNU Library - General Public License instead of this License. - ---- - -## CLASSPATH EXCEPTION - - Linking this library statically or dynamically with other modules is - making a combined work based on this library. Thus, the terms and - conditions of the GNU General Public License version 2 cover the whole - combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent - modules, and to copy and distribute the resulting executable under - terms of your choice, provided that you also meet, for each linked - independent module, the terms and conditions of the license of that - module. An independent module is a module which is not derived from or - based on this library. If you modify this library, you may extend this - exception to your version of the library, but you are not obligated to - do so. If you do not wish to do so, delete this exception statement - from your version. \ No newline at end of file diff --git a/material/licenses/collector/LICENSE-org.eclipse.persistence.jpa.txt b/material/licenses/collector/LICENSE-org.eclipse.persistence.jpa.txt deleted file mode 100644 index 3b7ae66064..0000000000 --- a/material/licenses/collector/LICENSE-org.eclipse.persistence.jpa.txt +++ /dev/null @@ -1,637 +0,0 @@ -# Eclipse Public License - v 2.0 - - THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE - PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION - OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - - 1. DEFINITIONS - - "Contribution" means: - - a) in the case of the initial Contributor, the initial content - Distributed under this Agreement, and - - b) in the case of each subsequent Contributor: - i) changes to the Program, and - ii) additions to the Program; - where such changes and/or additions to the Program originate from - and are Distributed by that particular Contributor. A Contribution - "originates" from a Contributor if it was added to the Program by - such Contributor itself or anyone acting on such Contributor's behalf. - Contributions do not include changes or additions to the Program that - are not Modified Works. - - "Contributor" means any person or entity that Distributes the Program. - - "Licensed Patents" mean patent claims licensable by a Contributor which - are necessarily infringed by the use or sale of its Contribution alone - or when combined with the Program. - - "Program" means the Contributions Distributed in accordance with this - Agreement. - - "Recipient" means anyone who receives the Program under this Agreement - or any Secondary License (as applicable), including Contributors. - - "Derivative Works" shall mean any work, whether in Source Code or other - form, that is based on (or derived from) the Program and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. - - "Modified Works" shall mean any work in Source Code or other form that - results from an addition to, deletion from, or modification of the - contents of the Program, including, for purposes of clarity any new file - in Source Code form that contains any contents of the Program. Modified - Works shall not include works that contain only declarations, - interfaces, types, classes, structures, or files of the Program solely - in each case in order to link to, bind by name, or subclass the Program - or Modified Works thereof. - - "Distribute" means the acts of a) distributing or b) making available - in any manner that enables the transfer of a copy. - - "Source Code" means the form of a Program preferred for making - modifications, including but not limited to software source code, - documentation source, and configuration files. - - "Secondary License" means either the GNU General Public License, - Version 2.0, or any later versions of that license, including any - exceptions or additional permissions as identified by the initial - Contributor. - - 2. GRANT OF RIGHTS - - a) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free copyright - license to reproduce, prepare Derivative Works of, publicly display, - publicly perform, Distribute and sublicense the Contribution of such - Contributor, if any, and such Derivative Works. - - b) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free patent - license under Licensed Patents to make, use, sell, offer to sell, - import and otherwise transfer the Contribution of such Contributor, - if any, in Source Code or other form. This patent license shall - apply to the combination of the Contribution and the Program if, at - the time the Contribution is added by the Contributor, such addition - of the Contribution causes such combination to be covered by the - Licensed Patents. The patent license shall not apply to any other - combinations which include the Contribution. No hardware per se is - licensed hereunder. - - c) Recipient understands that although each Contributor grants the - licenses to its Contributions set forth herein, no assurances are - provided by any Contributor that the Program does not infringe the - patent or other intellectual property rights of any other entity. - Each Contributor disclaims any liability to Recipient for claims - brought by any other entity based on infringement of intellectual - property rights or otherwise. As a condition to exercising the - rights and licenses granted hereunder, each Recipient hereby - assumes sole responsibility to secure any other intellectual - property rights needed, if any. For example, if a third party - patent license is required to allow Recipient to Distribute the - Program, it is Recipient's responsibility to acquire that license - before distributing the Program. - - d) Each Contributor represents that to its knowledge it has - sufficient copyright rights in its Contribution, if any, to grant - the copyright license set forth in this Agreement. - - e) Notwithstanding the terms of any Secondary License, no - Contributor makes additional grants to any Recipient (other than - those set forth in this Agreement) as a result of such Recipient's - receipt of the Program under the terms of a Secondary License - (if permitted under the terms of Section 3). - - 3. REQUIREMENTS - - 3.1 If a Contributor Distributes the Program in any form, then: - - a) the Program must also be made available as Source Code, in - accordance with section 3.2, and the Contributor must accompany - the Program with a statement that the Source Code for the Program - is available under this Agreement, and informs Recipients how to - obtain it in a reasonable manner on or through a medium customarily - used for software exchange; and - - b) the Contributor may Distribute the Program under a license - different than this Agreement, provided that such license: - i) effectively disclaims on behalf of all other Contributors all - warranties and conditions, express and implied, including - warranties or conditions of title and non-infringement, and - implied warranties or conditions of merchantability and fitness - for a particular purpose; - - ii) effectively excludes on behalf of all other Contributors all - liability for damages, including direct, indirect, special, - incidental and consequential damages, such as lost profits; - - iii) does not attempt to limit or alter the recipients' rights - in the Source Code under section 3.2; and - - iv) requires any subsequent distribution of the Program by any - party to be under a license that satisfies the requirements - of this section 3. - - 3.2 When the Program is Distributed as Source Code: - - a) it must be made available under this Agreement, or if the - Program (i) is combined with other material in a separate file or - files made available under a Secondary License, and (ii) the initial - Contributor attached to the Source Code the notice described in - Exhibit A of this Agreement, then the Program may be made available - under the terms of such Secondary Licenses, and - - b) a copy of this Agreement must be included with each copy of - the Program. - - 3.3 Contributors may not remove or alter any copyright, patent, - trademark, attribution notices, disclaimers of warranty, or limitations - of liability ("notices") contained within the Program from any copy of - the Program which they Distribute, provided that Contributors may add - their own appropriate notices. - - 4. COMMERCIAL DISTRIBUTION - - Commercial distributors of software may accept certain responsibilities - with respect to end users, business partners and the like. While this - license is intended to facilitate the commercial use of the Program, - the Contributor who includes the Program in a commercial product - offering should do so in a manner which does not create potential - liability for other Contributors. Therefore, if a Contributor includes - the Program in a commercial product offering, such Contributor - ("Commercial Contributor") hereby agrees to defend and indemnify every - other Contributor ("Indemnified Contributor") against any losses, - damages and costs (collectively "Losses") arising from claims, lawsuits - and other legal actions brought by a third party against the Indemnified - Contributor to the extent caused by the acts or omissions of such - Commercial Contributor in connection with its distribution of the Program - in a commercial product offering. The obligations in this section do not - apply to any claims or Losses relating to any actual or alleged - intellectual property infringement. In order to qualify, an Indemnified - Contributor must: a) promptly notify the Commercial Contributor in - writing of such claim, and b) allow the Commercial Contributor to control, - and cooperate with the Commercial Contributor in, the defense and any - related settlement negotiations. The Indemnified Contributor may - participate in any such claim at its own expense. - - For example, a Contributor might include the Program in a commercial - product offering, Product X. That Contributor is then a Commercial - Contributor. If that Commercial Contributor then makes performance - claims, or offers warranties related to Product X, those performance - claims and warranties are such Commercial Contributor's responsibility - alone. Under this section, the Commercial Contributor would have to - defend claims against the other Contributors related to those performance - claims and warranties, and if a court requires any other Contributor to - pay any damages as a result, the Commercial Contributor must pay - those damages. - - 5. NO WARRANTY - - EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT - PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS" - BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR - IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF - TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR - PURPOSE. Each Recipient is solely responsible for determining the - appropriateness of using and distributing the Program and assumes all - risks associated with its exercise of rights under this Agreement, - including but not limited to the risks and costs of program errors, - compliance with applicable laws, damage to or loss of data, programs - or equipment, and unavailability or interruption of operations. - - 6. DISCLAIMER OF LIABILITY - - EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT - PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS - SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST - PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE - EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGES. - - 7. GENERAL - - If any provision of this Agreement is invalid or unenforceable under - applicable law, it shall not affect the validity or enforceability of - the remainder of the terms of this Agreement, and without further - action by the parties hereto, such provision shall be reformed to the - minimum extent necessary to make such provision valid and enforceable. - - If Recipient institutes patent litigation against any entity - (including a cross-claim or counterclaim in a lawsuit) alleging that the - Program itself (excluding combinations of the Program with other software - or hardware) infringes such Recipient's patent(s), then such Recipient's - rights granted under Section 2(b) shall terminate as of the date such - litigation is filed. - - All Recipient's rights under this Agreement shall terminate if it - fails to comply with any of the material terms or conditions of this - Agreement and does not cure such failure in a reasonable period of - time after becoming aware of such noncompliance. If all Recipient's - rights under this Agreement terminate, Recipient agrees to cease use - and distribution of the Program as soon as reasonably practicable. - However, Recipient's obligations under this Agreement and any licenses - granted by Recipient relating to the Program shall continue and survive. - - Everyone is permitted to copy and distribute copies of this Agreement, - but in order to avoid inconsistency the Agreement is copyrighted and - may only be modified in the following manner. The Agreement Steward - reserves the right to publish new versions (including revisions) of - this Agreement from time to time. No one other than the Agreement - Steward has the right to modify this Agreement. The Eclipse Foundation - is the initial Agreement Steward. The Eclipse Foundation may assign the - responsibility to serve as the Agreement Steward to a suitable separate - entity. Each new version of the Agreement will be given a distinguishing - version number. The Program (including Contributions) may always be - Distributed subject to the version of the Agreement under which it was - received. In addition, after a new version of the Agreement is published, - Contributor may elect to Distribute the Program (including its - Contributions) under the new version. - - Except as expressly stated in Sections 2(a) and 2(b) above, Recipient - receives no rights or licenses to the intellectual property of any - Contributor under this Agreement, whether expressly, by implication, - estoppel or otherwise. All rights in the Program not expressly granted - under this Agreement are reserved. Nothing in this Agreement is intended - to be enforceable by any entity that is not a Contributor or Recipient. - No third-party beneficiary rights are created under this Agreement. - - Exhibit A - Form of Secondary Licenses Notice - - "This Source Code may also be made available under the following - Secondary Licenses when the conditions for such availability set forth - in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), - version(s), and exceptions or additional permissions here}." - - Simply including a copy of this Agreement, including this Exhibit A - is not sufficient to license the Source Code under Secondary Licenses. - - If it is not possible or desirable to put the notice in a particular - file, then You may include the notice in a location (such as a LICENSE - file in a relevant directory) where a recipient would be likely to - look for such a notice. - - You may add additional accurate notices of copyright ownership. - ---- - -## The GNU General Public License (GPL) Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor - Boston, MA 02110-1335 - USA - - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your freedom to - share and change it. By contrast, the GNU General Public License is - intended to guarantee your freedom to share and change free software--to - make sure the software is free for all its users. This General Public - License applies to most of the Free Software Foundation's software and - to any other program whose authors commit to using it. (Some other Free - Software Foundation software is covered by the GNU Library General - Public License instead.) You can apply it to your programs, too. - - When we speak of free software, we are referring to freedom, not price. - Our General Public Licenses are designed to make sure that you have the - freedom to distribute copies of free software (and charge for this - service if you wish), that you receive source code or can get it if you - want it, that you can change the software or use pieces of it in new - free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid anyone - to deny you these rights or to ask you to surrender the rights. These - restrictions translate to certain responsibilities for you if you - distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether gratis - or for a fee, you must give the recipients all the rights that you have. - You must make sure that they, too, receive or can get the source code. - And you must show them these terms so they know their rights. - - We protect your rights with two steps: (1) copyright the software, and - (2) offer you this license which gives you legal permission to copy, - distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain - that everyone understands that there is no warranty for this free - software. If the software is modified by someone else and passed on, we - want its recipients to know that what they have is not the original, so - that any problems introduced by others will not reflect on the original - authors' reputations. - - Finally, any free program is threatened constantly by software patents. - We wish to avoid the danger that redistributors of a free program will - individually obtain patent licenses, in effect making the program - proprietary. To prevent this, we have made it clear that any patent must - be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and - modification follow. - - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains a - notice placed by the copyright holder saying it may be distributed under - the terms of this General Public License. The "Program", below, refers - to any such program or work, and a "work based on the Program" means - either the Program or any derivative work under copyright law: that is - to say, a work containing the Program or a portion of it, either - verbatim or with modifications and/or translated into another language. - (Hereinafter, translation is included without limitation in the term - "modification".) Each licensee is addressed as "you". - - Activities other than copying, distribution and modification are not - covered by this License; they are outside its scope. The act of running - the Program is not restricted, and the output from the Program is - covered only if its contents constitute a work based on the Program - (independent of having been made by running the Program). Whether that - is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's source - code as you receive it, in any medium, provided that you conspicuously - and appropriately publish on each copy an appropriate copyright notice - and disclaimer of warranty; keep intact all the notices that refer to - this License and to the absence of any warranty; and give any other - recipients of the Program a copy of this License along with the Program. - - You may charge a fee for the physical act of transferring a copy, and - you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion of - it, thus forming a work based on the Program, and copy and distribute - such modifications or work under the terms of Section 1 above, provided - that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any part - thereof, to be licensed as a whole at no charge to all third parties - under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a notice - that there is no warranty (or else, saying that you provide a - warranty) and that users may redistribute the program under these - conditions, and telling the user how to view a copy of this License. - (Exception: if the Program itself is interactive but does not - normally print such an announcement, your work based on the Program - is not required to print an announcement.) - - These requirements apply to the modified work as a whole. If - identifiable sections of that work are not derived from the Program, and - can be reasonably considered independent and separate works in - themselves, then this License, and its terms, do not apply to those - sections when you distribute them as separate works. But when you - distribute the same sections as part of a whole which is a work based on - the Program, the distribution of the whole must be on the terms of this - License, whose permissions for other licensees extend to the entire - whole, and thus to each and every part regardless of who wrote it. - - Thus, it is not the intent of this section to claim rights or contest - your rights to work written entirely by you; rather, the intent is to - exercise the right to control the distribution of derivative or - collective works based on the Program. - - In addition, mere aggregation of another work not based on the Program - with the Program (or with a work based on the Program) on a volume of a - storage or distribution medium does not bring the other work under the - scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, - under Section 2) in object code or executable form under the terms of - Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your cost - of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed - only for noncommercial distribution and only if you received the - program in object code or executable form with such an offer, in - accord with Subsection b above.) - - The source code for a work means the preferred form of the work for - making modifications to it. For an executable work, complete source code - means all the source code for all modules it contains, plus any - associated interface definition files, plus the scripts used to control - compilation and installation of the executable. However, as a special - exception, the source code distributed need not include anything that is - normally distributed (in either source or binary form) with the major - components (compiler, kernel, and so on) of the operating system on - which the executable runs, unless that component itself accompanies the - executable. - - If distribution of executable or object code is made by offering access - to copy from a designated place, then offering equivalent access to copy - the source code from the same place counts as distribution of the source - code, even though third parties are not compelled to copy the source - along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program - except as expressly provided under this License. Any attempt otherwise - to copy, modify, sublicense or distribute the Program is void, and will - automatically terminate your rights under this License. However, parties - who have received copies, or rights, from you under this License will - not have their licenses terminated so long as such parties remain in - full compliance. - - 5. You are not required to accept this License, since you have not - signed it. However, nothing else grants you permission to modify or - distribute the Program or its derivative works. These actions are - prohibited by law if you do not accept this License. Therefore, by - modifying or distributing the Program (or any work based on the - Program), you indicate your acceptance of this License to do so, and all - its terms and conditions for copying, distributing or modifying the - Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the - Program), the recipient automatically receives a license from the - original licensor to copy, distribute or modify the Program subject to - these terms and conditions. You may not impose any further restrictions - on the recipients' exercise of the rights granted herein. You are not - responsible for enforcing compliance by third parties to this License. - - 7. If, as a consequence of a court judgment or allegation of patent - infringement or for any other reason (not limited to patent issues), - conditions are imposed on you (whether by court order, agreement or - otherwise) that contradict the conditions of this License, they do not - excuse you from the conditions of this License. If you cannot distribute - so as to satisfy simultaneously your obligations under this License and - any other pertinent obligations, then as a consequence you may not - distribute the Program at all. For example, if a patent license would - not permit royalty-free redistribution of the Program by all those who - receive copies directly or indirectly through you, then the only way you - could satisfy both it and this License would be to refrain entirely from - distribution of the Program. - - If any portion of this section is held invalid or unenforceable under - any particular circumstance, the balance of the section is intended to - apply and the section as a whole is intended to apply in other - circumstances. - - It is not the purpose of this section to induce you to infringe any - patents or other property right claims or to contest validity of any - such claims; this section has the sole purpose of protecting the - integrity of the free software distribution system, which is implemented - by public license practices. Many people have made generous - contributions to the wide range of software distributed through that - system in reliance on consistent application of that system; it is up to - the author/donor to decide if he or she is willing to distribute - software through any other system and a licensee cannot impose that choice. - - This section is intended to make thoroughly clear what is believed to be - a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in - certain countries either by patents or by copyrighted interfaces, the - original copyright holder who places the Program under this License may - add an explicit geographical distribution limitation excluding those - countries, so that distribution is permitted only in or among countries - not thus excluded. In such case, this License incorporates the - limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new - versions of the 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 Program - specifies a version number of this License which applies to it and "any - later version", you have the option of following the terms and - conditions either of that version or of any later version published by - the Free Software Foundation. If the Program does not specify a version - number of this License, you may choose any version ever published by the - Free Software Foundation. - - 10. If you wish to incorporate parts of the Program into other free - programs whose distribution conditions are different, write to the - author to ask for permission. For software which is copyrighted by the - Free Software Foundation, write to the Free Software Foundation; we - sometimes make exceptions for this. Our decision will be guided by the - two goals of preserving the free status of all derivatives of our free - software and of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO - WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. - EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR - OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, - EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE - ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH - YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL - NECESSARY SERVICING, REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN - WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY - AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR - DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL - DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM - (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED - INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF - THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR - OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest - possible use to the public, the best way to achieve this is to make it - free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest to - attach them to the start of each source file to most effectively convey - the exclusion of warranty; and each file should have at least the - "copyright" line and a pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA - - Also add information on how to contact you by electronic and paper mail. - - If the program is interactive, make it output a short notice like this - when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type - `show w'. This is free software, and you are welcome to redistribute - it under certain conditions; type `show c' for details. - - The hypothetical commands `show w' and `show c' should show the - appropriate parts of the General Public License. Of course, the commands - you use may be called something other than `show w' and `show c'; they - could even be mouse-clicks or menu items--whatever suits your program. - - You should also get your employer (if you work as a programmer) or your - school, if any, to sign a "copyright disclaimer" for the program, if - necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - program `Gnomovision' (which makes passes at compilers) written by - James Hacker. - - signature of Ty Coon, 1 April 1989 - Ty Coon, President of Vice - - This General Public License does not permit incorporating your program - into proprietary programs. If your program is a subroutine library, you - may consider it more useful to permit linking proprietary applications - with the library. If this is what you want to do, use the GNU Library - General Public License instead of this License. - ---- - -## CLASSPATH EXCEPTION - - Linking this library statically or dynamically with other modules is - making a combined work based on this library. Thus, the terms and - conditions of the GNU General Public License version 2 cover the whole - combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent - modules, and to copy and distribute the resulting executable under - terms of your choice, provided that you also meet, for each linked - independent module, the terms and conditions of the license of that - module. An independent module is a module which is not derived from or - based on this library. If you modify this library, you may extend this - exception to your version of the library, but you are not obligated to - do so. If you do not wish to do so, delete this exception statement - from your version. \ No newline at end of file diff --git a/material/licenses/collector/LICENSE-org.eclipse.persistence.jpql.txt b/material/licenses/collector/LICENSE-org.eclipse.persistence.jpql.txt deleted file mode 100644 index 3b7ae66064..0000000000 --- a/material/licenses/collector/LICENSE-org.eclipse.persistence.jpql.txt +++ /dev/null @@ -1,637 +0,0 @@ -# Eclipse Public License - v 2.0 - - THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE - PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION - OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - - 1. DEFINITIONS - - "Contribution" means: - - a) in the case of the initial Contributor, the initial content - Distributed under this Agreement, and - - b) in the case of each subsequent Contributor: - i) changes to the Program, and - ii) additions to the Program; - where such changes and/or additions to the Program originate from - and are Distributed by that particular Contributor. A Contribution - "originates" from a Contributor if it was added to the Program by - such Contributor itself or anyone acting on such Contributor's behalf. - Contributions do not include changes or additions to the Program that - are not Modified Works. - - "Contributor" means any person or entity that Distributes the Program. - - "Licensed Patents" mean patent claims licensable by a Contributor which - are necessarily infringed by the use or sale of its Contribution alone - or when combined with the Program. - - "Program" means the Contributions Distributed in accordance with this - Agreement. - - "Recipient" means anyone who receives the Program under this Agreement - or any Secondary License (as applicable), including Contributors. - - "Derivative Works" shall mean any work, whether in Source Code or other - form, that is based on (or derived from) the Program and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. - - "Modified Works" shall mean any work in Source Code or other form that - results from an addition to, deletion from, or modification of the - contents of the Program, including, for purposes of clarity any new file - in Source Code form that contains any contents of the Program. Modified - Works shall not include works that contain only declarations, - interfaces, types, classes, structures, or files of the Program solely - in each case in order to link to, bind by name, or subclass the Program - or Modified Works thereof. - - "Distribute" means the acts of a) distributing or b) making available - in any manner that enables the transfer of a copy. - - "Source Code" means the form of a Program preferred for making - modifications, including but not limited to software source code, - documentation source, and configuration files. - - "Secondary License" means either the GNU General Public License, - Version 2.0, or any later versions of that license, including any - exceptions or additional permissions as identified by the initial - Contributor. - - 2. GRANT OF RIGHTS - - a) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free copyright - license to reproduce, prepare Derivative Works of, publicly display, - publicly perform, Distribute and sublicense the Contribution of such - Contributor, if any, and such Derivative Works. - - b) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free patent - license under Licensed Patents to make, use, sell, offer to sell, - import and otherwise transfer the Contribution of such Contributor, - if any, in Source Code or other form. This patent license shall - apply to the combination of the Contribution and the Program if, at - the time the Contribution is added by the Contributor, such addition - of the Contribution causes such combination to be covered by the - Licensed Patents. The patent license shall not apply to any other - combinations which include the Contribution. No hardware per se is - licensed hereunder. - - c) Recipient understands that although each Contributor grants the - licenses to its Contributions set forth herein, no assurances are - provided by any Contributor that the Program does not infringe the - patent or other intellectual property rights of any other entity. - Each Contributor disclaims any liability to Recipient for claims - brought by any other entity based on infringement of intellectual - property rights or otherwise. As a condition to exercising the - rights and licenses granted hereunder, each Recipient hereby - assumes sole responsibility to secure any other intellectual - property rights needed, if any. For example, if a third party - patent license is required to allow Recipient to Distribute the - Program, it is Recipient's responsibility to acquire that license - before distributing the Program. - - d) Each Contributor represents that to its knowledge it has - sufficient copyright rights in its Contribution, if any, to grant - the copyright license set forth in this Agreement. - - e) Notwithstanding the terms of any Secondary License, no - Contributor makes additional grants to any Recipient (other than - those set forth in this Agreement) as a result of such Recipient's - receipt of the Program under the terms of a Secondary License - (if permitted under the terms of Section 3). - - 3. REQUIREMENTS - - 3.1 If a Contributor Distributes the Program in any form, then: - - a) the Program must also be made available as Source Code, in - accordance with section 3.2, and the Contributor must accompany - the Program with a statement that the Source Code for the Program - is available under this Agreement, and informs Recipients how to - obtain it in a reasonable manner on or through a medium customarily - used for software exchange; and - - b) the Contributor may Distribute the Program under a license - different than this Agreement, provided that such license: - i) effectively disclaims on behalf of all other Contributors all - warranties and conditions, express and implied, including - warranties or conditions of title and non-infringement, and - implied warranties or conditions of merchantability and fitness - for a particular purpose; - - ii) effectively excludes on behalf of all other Contributors all - liability for damages, including direct, indirect, special, - incidental and consequential damages, such as lost profits; - - iii) does not attempt to limit or alter the recipients' rights - in the Source Code under section 3.2; and - - iv) requires any subsequent distribution of the Program by any - party to be under a license that satisfies the requirements - of this section 3. - - 3.2 When the Program is Distributed as Source Code: - - a) it must be made available under this Agreement, or if the - Program (i) is combined with other material in a separate file or - files made available under a Secondary License, and (ii) the initial - Contributor attached to the Source Code the notice described in - Exhibit A of this Agreement, then the Program may be made available - under the terms of such Secondary Licenses, and - - b) a copy of this Agreement must be included with each copy of - the Program. - - 3.3 Contributors may not remove or alter any copyright, patent, - trademark, attribution notices, disclaimers of warranty, or limitations - of liability ("notices") contained within the Program from any copy of - the Program which they Distribute, provided that Contributors may add - their own appropriate notices. - - 4. COMMERCIAL DISTRIBUTION - - Commercial distributors of software may accept certain responsibilities - with respect to end users, business partners and the like. While this - license is intended to facilitate the commercial use of the Program, - the Contributor who includes the Program in a commercial product - offering should do so in a manner which does not create potential - liability for other Contributors. Therefore, if a Contributor includes - the Program in a commercial product offering, such Contributor - ("Commercial Contributor") hereby agrees to defend and indemnify every - other Contributor ("Indemnified Contributor") against any losses, - damages and costs (collectively "Losses") arising from claims, lawsuits - and other legal actions brought by a third party against the Indemnified - Contributor to the extent caused by the acts or omissions of such - Commercial Contributor in connection with its distribution of the Program - in a commercial product offering. The obligations in this section do not - apply to any claims or Losses relating to any actual or alleged - intellectual property infringement. In order to qualify, an Indemnified - Contributor must: a) promptly notify the Commercial Contributor in - writing of such claim, and b) allow the Commercial Contributor to control, - and cooperate with the Commercial Contributor in, the defense and any - related settlement negotiations. The Indemnified Contributor may - participate in any such claim at its own expense. - - For example, a Contributor might include the Program in a commercial - product offering, Product X. That Contributor is then a Commercial - Contributor. If that Commercial Contributor then makes performance - claims, or offers warranties related to Product X, those performance - claims and warranties are such Commercial Contributor's responsibility - alone. Under this section, the Commercial Contributor would have to - defend claims against the other Contributors related to those performance - claims and warranties, and if a court requires any other Contributor to - pay any damages as a result, the Commercial Contributor must pay - those damages. - - 5. NO WARRANTY - - EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT - PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS" - BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR - IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF - TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR - PURPOSE. Each Recipient is solely responsible for determining the - appropriateness of using and distributing the Program and assumes all - risks associated with its exercise of rights under this Agreement, - including but not limited to the risks and costs of program errors, - compliance with applicable laws, damage to or loss of data, programs - or equipment, and unavailability or interruption of operations. - - 6. DISCLAIMER OF LIABILITY - - EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT - PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS - SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST - PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE - EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGES. - - 7. GENERAL - - If any provision of this Agreement is invalid or unenforceable under - applicable law, it shall not affect the validity or enforceability of - the remainder of the terms of this Agreement, and without further - action by the parties hereto, such provision shall be reformed to the - minimum extent necessary to make such provision valid and enforceable. - - If Recipient institutes patent litigation against any entity - (including a cross-claim or counterclaim in a lawsuit) alleging that the - Program itself (excluding combinations of the Program with other software - or hardware) infringes such Recipient's patent(s), then such Recipient's - rights granted under Section 2(b) shall terminate as of the date such - litigation is filed. - - All Recipient's rights under this Agreement shall terminate if it - fails to comply with any of the material terms or conditions of this - Agreement and does not cure such failure in a reasonable period of - time after becoming aware of such noncompliance. If all Recipient's - rights under this Agreement terminate, Recipient agrees to cease use - and distribution of the Program as soon as reasonably practicable. - However, Recipient's obligations under this Agreement and any licenses - granted by Recipient relating to the Program shall continue and survive. - - Everyone is permitted to copy and distribute copies of this Agreement, - but in order to avoid inconsistency the Agreement is copyrighted and - may only be modified in the following manner. The Agreement Steward - reserves the right to publish new versions (including revisions) of - this Agreement from time to time. No one other than the Agreement - Steward has the right to modify this Agreement. The Eclipse Foundation - is the initial Agreement Steward. The Eclipse Foundation may assign the - responsibility to serve as the Agreement Steward to a suitable separate - entity. Each new version of the Agreement will be given a distinguishing - version number. The Program (including Contributions) may always be - Distributed subject to the version of the Agreement under which it was - received. In addition, after a new version of the Agreement is published, - Contributor may elect to Distribute the Program (including its - Contributions) under the new version. - - Except as expressly stated in Sections 2(a) and 2(b) above, Recipient - receives no rights or licenses to the intellectual property of any - Contributor under this Agreement, whether expressly, by implication, - estoppel or otherwise. All rights in the Program not expressly granted - under this Agreement are reserved. Nothing in this Agreement is intended - to be enforceable by any entity that is not a Contributor or Recipient. - No third-party beneficiary rights are created under this Agreement. - - Exhibit A - Form of Secondary Licenses Notice - - "This Source Code may also be made available under the following - Secondary Licenses when the conditions for such availability set forth - in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), - version(s), and exceptions or additional permissions here}." - - Simply including a copy of this Agreement, including this Exhibit A - is not sufficient to license the Source Code under Secondary Licenses. - - If it is not possible or desirable to put the notice in a particular - file, then You may include the notice in a location (such as a LICENSE - file in a relevant directory) where a recipient would be likely to - look for such a notice. - - You may add additional accurate notices of copyright ownership. - ---- - -## The GNU General Public License (GPL) Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor - Boston, MA 02110-1335 - USA - - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your freedom to - share and change it. By contrast, the GNU General Public License is - intended to guarantee your freedom to share and change free software--to - make sure the software is free for all its users. This General Public - License applies to most of the Free Software Foundation's software and - to any other program whose authors commit to using it. (Some other Free - Software Foundation software is covered by the GNU Library General - Public License instead.) You can apply it to your programs, too. - - When we speak of free software, we are referring to freedom, not price. - Our General Public Licenses are designed to make sure that you have the - freedom to distribute copies of free software (and charge for this - service if you wish), that you receive source code or can get it if you - want it, that you can change the software or use pieces of it in new - free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid anyone - to deny you these rights or to ask you to surrender the rights. These - restrictions translate to certain responsibilities for you if you - distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether gratis - or for a fee, you must give the recipients all the rights that you have. - You must make sure that they, too, receive or can get the source code. - And you must show them these terms so they know their rights. - - We protect your rights with two steps: (1) copyright the software, and - (2) offer you this license which gives you legal permission to copy, - distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain - that everyone understands that there is no warranty for this free - software. If the software is modified by someone else and passed on, we - want its recipients to know that what they have is not the original, so - that any problems introduced by others will not reflect on the original - authors' reputations. - - Finally, any free program is threatened constantly by software patents. - We wish to avoid the danger that redistributors of a free program will - individually obtain patent licenses, in effect making the program - proprietary. To prevent this, we have made it clear that any patent must - be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and - modification follow. - - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains a - notice placed by the copyright holder saying it may be distributed under - the terms of this General Public License. The "Program", below, refers - to any such program or work, and a "work based on the Program" means - either the Program or any derivative work under copyright law: that is - to say, a work containing the Program or a portion of it, either - verbatim or with modifications and/or translated into another language. - (Hereinafter, translation is included without limitation in the term - "modification".) Each licensee is addressed as "you". - - Activities other than copying, distribution and modification are not - covered by this License; they are outside its scope. The act of running - the Program is not restricted, and the output from the Program is - covered only if its contents constitute a work based on the Program - (independent of having been made by running the Program). Whether that - is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's source - code as you receive it, in any medium, provided that you conspicuously - and appropriately publish on each copy an appropriate copyright notice - and disclaimer of warranty; keep intact all the notices that refer to - this License and to the absence of any warranty; and give any other - recipients of the Program a copy of this License along with the Program. - - You may charge a fee for the physical act of transferring a copy, and - you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion of - it, thus forming a work based on the Program, and copy and distribute - such modifications or work under the terms of Section 1 above, provided - that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any part - thereof, to be licensed as a whole at no charge to all third parties - under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a notice - that there is no warranty (or else, saying that you provide a - warranty) and that users may redistribute the program under these - conditions, and telling the user how to view a copy of this License. - (Exception: if the Program itself is interactive but does not - normally print such an announcement, your work based on the Program - is not required to print an announcement.) - - These requirements apply to the modified work as a whole. If - identifiable sections of that work are not derived from the Program, and - can be reasonably considered independent and separate works in - themselves, then this License, and its terms, do not apply to those - sections when you distribute them as separate works. But when you - distribute the same sections as part of a whole which is a work based on - the Program, the distribution of the whole must be on the terms of this - License, whose permissions for other licensees extend to the entire - whole, and thus to each and every part regardless of who wrote it. - - Thus, it is not the intent of this section to claim rights or contest - your rights to work written entirely by you; rather, the intent is to - exercise the right to control the distribution of derivative or - collective works based on the Program. - - In addition, mere aggregation of another work not based on the Program - with the Program (or with a work based on the Program) on a volume of a - storage or distribution medium does not bring the other work under the - scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, - under Section 2) in object code or executable form under the terms of - Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your cost - of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed - only for noncommercial distribution and only if you received the - program in object code or executable form with such an offer, in - accord with Subsection b above.) - - The source code for a work means the preferred form of the work for - making modifications to it. For an executable work, complete source code - means all the source code for all modules it contains, plus any - associated interface definition files, plus the scripts used to control - compilation and installation of the executable. However, as a special - exception, the source code distributed need not include anything that is - normally distributed (in either source or binary form) with the major - components (compiler, kernel, and so on) of the operating system on - which the executable runs, unless that component itself accompanies the - executable. - - If distribution of executable or object code is made by offering access - to copy from a designated place, then offering equivalent access to copy - the source code from the same place counts as distribution of the source - code, even though third parties are not compelled to copy the source - along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program - except as expressly provided under this License. Any attempt otherwise - to copy, modify, sublicense or distribute the Program is void, and will - automatically terminate your rights under this License. However, parties - who have received copies, or rights, from you under this License will - not have their licenses terminated so long as such parties remain in - full compliance. - - 5. You are not required to accept this License, since you have not - signed it. However, nothing else grants you permission to modify or - distribute the Program or its derivative works. These actions are - prohibited by law if you do not accept this License. Therefore, by - modifying or distributing the Program (or any work based on the - Program), you indicate your acceptance of this License to do so, and all - its terms and conditions for copying, distributing or modifying the - Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the - Program), the recipient automatically receives a license from the - original licensor to copy, distribute or modify the Program subject to - these terms and conditions. You may not impose any further restrictions - on the recipients' exercise of the rights granted herein. You are not - responsible for enforcing compliance by third parties to this License. - - 7. If, as a consequence of a court judgment or allegation of patent - infringement or for any other reason (not limited to patent issues), - conditions are imposed on you (whether by court order, agreement or - otherwise) that contradict the conditions of this License, they do not - excuse you from the conditions of this License. If you cannot distribute - so as to satisfy simultaneously your obligations under this License and - any other pertinent obligations, then as a consequence you may not - distribute the Program at all. For example, if a patent license would - not permit royalty-free redistribution of the Program by all those who - receive copies directly or indirectly through you, then the only way you - could satisfy both it and this License would be to refrain entirely from - distribution of the Program. - - If any portion of this section is held invalid or unenforceable under - any particular circumstance, the balance of the section is intended to - apply and the section as a whole is intended to apply in other - circumstances. - - It is not the purpose of this section to induce you to infringe any - patents or other property right claims or to contest validity of any - such claims; this section has the sole purpose of protecting the - integrity of the free software distribution system, which is implemented - by public license practices. Many people have made generous - contributions to the wide range of software distributed through that - system in reliance on consistent application of that system; it is up to - the author/donor to decide if he or she is willing to distribute - software through any other system and a licensee cannot impose that choice. - - This section is intended to make thoroughly clear what is believed to be - a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in - certain countries either by patents or by copyrighted interfaces, the - original copyright holder who places the Program under this License may - add an explicit geographical distribution limitation excluding those - countries, so that distribution is permitted only in or among countries - not thus excluded. In such case, this License incorporates the - limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new - versions of the 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 Program - specifies a version number of this License which applies to it and "any - later version", you have the option of following the terms and - conditions either of that version or of any later version published by - the Free Software Foundation. If the Program does not specify a version - number of this License, you may choose any version ever published by the - Free Software Foundation. - - 10. If you wish to incorporate parts of the Program into other free - programs whose distribution conditions are different, write to the - author to ask for permission. For software which is copyrighted by the - Free Software Foundation, write to the Free Software Foundation; we - sometimes make exceptions for this. Our decision will be guided by the - two goals of preserving the free status of all derivatives of our free - software and of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO - WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. - EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR - OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, - EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE - ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH - YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL - NECESSARY SERVICING, REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN - WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY - AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR - DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL - DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM - (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED - INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF - THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR - OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest - possible use to the public, the best way to achieve this is to make it - free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest to - attach them to the start of each source file to most effectively convey - the exclusion of warranty; and each file should have at least the - "copyright" line and a pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA - - Also add information on how to contact you by electronic and paper mail. - - If the program is interactive, make it output a short notice like this - when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type - `show w'. This is free software, and you are welcome to redistribute - it under certain conditions; type `show c' for details. - - The hypothetical commands `show w' and `show c' should show the - appropriate parts of the General Public License. Of course, the commands - you use may be called something other than `show w' and `show c'; they - could even be mouse-clicks or menu items--whatever suits your program. - - You should also get your employer (if you work as a programmer) or your - school, if any, to sign a "copyright disclaimer" for the program, if - necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - program `Gnomovision' (which makes passes at compilers) written by - James Hacker. - - signature of Ty Coon, 1 April 1989 - Ty Coon, President of Vice - - This General Public License does not permit incorporating your program - into proprietary programs. If your program is a subroutine library, you - may consider it more useful to permit linking proprietary applications - with the library. If this is what you want to do, use the GNU Library - General Public License instead of this License. - ---- - -## CLASSPATH EXCEPTION - - Linking this library statically or dynamically with other modules is - making a combined work based on this library. Thus, the terms and - conditions of the GNU General Public License version 2 cover the whole - combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent - modules, and to copy and distribute the resulting executable under - terms of your choice, provided that you also meet, for each linked - independent module, the terms and conditions of the license of that - module. An independent module is a module which is not derived from or - based on this library. If you modify this library, you may extend this - exception to your version of the library, but you are not obligated to - do so. If you do not wish to do so, delete this exception statement - from your version. \ No newline at end of file diff --git a/material/licenses/collector/LICENSE-org.eclipse.persistence.txt b/material/licenses/collector/LICENSE-org.eclipse.persistence.txt deleted file mode 100644 index 3b7ae66064..0000000000 --- a/material/licenses/collector/LICENSE-org.eclipse.persistence.txt +++ /dev/null @@ -1,637 +0,0 @@ -# Eclipse Public License - v 2.0 - - THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE - PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION - OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - - 1. DEFINITIONS - - "Contribution" means: - - a) in the case of the initial Contributor, the initial content - Distributed under this Agreement, and - - b) in the case of each subsequent Contributor: - i) changes to the Program, and - ii) additions to the Program; - where such changes and/or additions to the Program originate from - and are Distributed by that particular Contributor. A Contribution - "originates" from a Contributor if it was added to the Program by - such Contributor itself or anyone acting on such Contributor's behalf. - Contributions do not include changes or additions to the Program that - are not Modified Works. - - "Contributor" means any person or entity that Distributes the Program. - - "Licensed Patents" mean patent claims licensable by a Contributor which - are necessarily infringed by the use or sale of its Contribution alone - or when combined with the Program. - - "Program" means the Contributions Distributed in accordance with this - Agreement. - - "Recipient" means anyone who receives the Program under this Agreement - or any Secondary License (as applicable), including Contributors. - - "Derivative Works" shall mean any work, whether in Source Code or other - form, that is based on (or derived from) the Program and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. - - "Modified Works" shall mean any work in Source Code or other form that - results from an addition to, deletion from, or modification of the - contents of the Program, including, for purposes of clarity any new file - in Source Code form that contains any contents of the Program. Modified - Works shall not include works that contain only declarations, - interfaces, types, classes, structures, or files of the Program solely - in each case in order to link to, bind by name, or subclass the Program - or Modified Works thereof. - - "Distribute" means the acts of a) distributing or b) making available - in any manner that enables the transfer of a copy. - - "Source Code" means the form of a Program preferred for making - modifications, including but not limited to software source code, - documentation source, and configuration files. - - "Secondary License" means either the GNU General Public License, - Version 2.0, or any later versions of that license, including any - exceptions or additional permissions as identified by the initial - Contributor. - - 2. GRANT OF RIGHTS - - a) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free copyright - license to reproduce, prepare Derivative Works of, publicly display, - publicly perform, Distribute and sublicense the Contribution of such - Contributor, if any, and such Derivative Works. - - b) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free patent - license under Licensed Patents to make, use, sell, offer to sell, - import and otherwise transfer the Contribution of such Contributor, - if any, in Source Code or other form. This patent license shall - apply to the combination of the Contribution and the Program if, at - the time the Contribution is added by the Contributor, such addition - of the Contribution causes such combination to be covered by the - Licensed Patents. The patent license shall not apply to any other - combinations which include the Contribution. No hardware per se is - licensed hereunder. - - c) Recipient understands that although each Contributor grants the - licenses to its Contributions set forth herein, no assurances are - provided by any Contributor that the Program does not infringe the - patent or other intellectual property rights of any other entity. - Each Contributor disclaims any liability to Recipient for claims - brought by any other entity based on infringement of intellectual - property rights or otherwise. As a condition to exercising the - rights and licenses granted hereunder, each Recipient hereby - assumes sole responsibility to secure any other intellectual - property rights needed, if any. For example, if a third party - patent license is required to allow Recipient to Distribute the - Program, it is Recipient's responsibility to acquire that license - before distributing the Program. - - d) Each Contributor represents that to its knowledge it has - sufficient copyright rights in its Contribution, if any, to grant - the copyright license set forth in this Agreement. - - e) Notwithstanding the terms of any Secondary License, no - Contributor makes additional grants to any Recipient (other than - those set forth in this Agreement) as a result of such Recipient's - receipt of the Program under the terms of a Secondary License - (if permitted under the terms of Section 3). - - 3. REQUIREMENTS - - 3.1 If a Contributor Distributes the Program in any form, then: - - a) the Program must also be made available as Source Code, in - accordance with section 3.2, and the Contributor must accompany - the Program with a statement that the Source Code for the Program - is available under this Agreement, and informs Recipients how to - obtain it in a reasonable manner on or through a medium customarily - used for software exchange; and - - b) the Contributor may Distribute the Program under a license - different than this Agreement, provided that such license: - i) effectively disclaims on behalf of all other Contributors all - warranties and conditions, express and implied, including - warranties or conditions of title and non-infringement, and - implied warranties or conditions of merchantability and fitness - for a particular purpose; - - ii) effectively excludes on behalf of all other Contributors all - liability for damages, including direct, indirect, special, - incidental and consequential damages, such as lost profits; - - iii) does not attempt to limit or alter the recipients' rights - in the Source Code under section 3.2; and - - iv) requires any subsequent distribution of the Program by any - party to be under a license that satisfies the requirements - of this section 3. - - 3.2 When the Program is Distributed as Source Code: - - a) it must be made available under this Agreement, or if the - Program (i) is combined with other material in a separate file or - files made available under a Secondary License, and (ii) the initial - Contributor attached to the Source Code the notice described in - Exhibit A of this Agreement, then the Program may be made available - under the terms of such Secondary Licenses, and - - b) a copy of this Agreement must be included with each copy of - the Program. - - 3.3 Contributors may not remove or alter any copyright, patent, - trademark, attribution notices, disclaimers of warranty, or limitations - of liability ("notices") contained within the Program from any copy of - the Program which they Distribute, provided that Contributors may add - their own appropriate notices. - - 4. COMMERCIAL DISTRIBUTION - - Commercial distributors of software may accept certain responsibilities - with respect to end users, business partners and the like. While this - license is intended to facilitate the commercial use of the Program, - the Contributor who includes the Program in a commercial product - offering should do so in a manner which does not create potential - liability for other Contributors. Therefore, if a Contributor includes - the Program in a commercial product offering, such Contributor - ("Commercial Contributor") hereby agrees to defend and indemnify every - other Contributor ("Indemnified Contributor") against any losses, - damages and costs (collectively "Losses") arising from claims, lawsuits - and other legal actions brought by a third party against the Indemnified - Contributor to the extent caused by the acts or omissions of such - Commercial Contributor in connection with its distribution of the Program - in a commercial product offering. The obligations in this section do not - apply to any claims or Losses relating to any actual or alleged - intellectual property infringement. In order to qualify, an Indemnified - Contributor must: a) promptly notify the Commercial Contributor in - writing of such claim, and b) allow the Commercial Contributor to control, - and cooperate with the Commercial Contributor in, the defense and any - related settlement negotiations. The Indemnified Contributor may - participate in any such claim at its own expense. - - For example, a Contributor might include the Program in a commercial - product offering, Product X. That Contributor is then a Commercial - Contributor. If that Commercial Contributor then makes performance - claims, or offers warranties related to Product X, those performance - claims and warranties are such Commercial Contributor's responsibility - alone. Under this section, the Commercial Contributor would have to - defend claims against the other Contributors related to those performance - claims and warranties, and if a court requires any other Contributor to - pay any damages as a result, the Commercial Contributor must pay - those damages. - - 5. NO WARRANTY - - EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT - PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS" - BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR - IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF - TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR - PURPOSE. Each Recipient is solely responsible for determining the - appropriateness of using and distributing the Program and assumes all - risks associated with its exercise of rights under this Agreement, - including but not limited to the risks and costs of program errors, - compliance with applicable laws, damage to or loss of data, programs - or equipment, and unavailability or interruption of operations. - - 6. DISCLAIMER OF LIABILITY - - EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT - PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS - SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST - PROFITS), 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 OR DISTRIBUTION OF THE PROGRAM OR THE - EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGES. - - 7. GENERAL - - If any provision of this Agreement is invalid or unenforceable under - applicable law, it shall not affect the validity or enforceability of - the remainder of the terms of this Agreement, and without further - action by the parties hereto, such provision shall be reformed to the - minimum extent necessary to make such provision valid and enforceable. - - If Recipient institutes patent litigation against any entity - (including a cross-claim or counterclaim in a lawsuit) alleging that the - Program itself (excluding combinations of the Program with other software - or hardware) infringes such Recipient's patent(s), then such Recipient's - rights granted under Section 2(b) shall terminate as of the date such - litigation is filed. - - All Recipient's rights under this Agreement shall terminate if it - fails to comply with any of the material terms or conditions of this - Agreement and does not cure such failure in a reasonable period of - time after becoming aware of such noncompliance. If all Recipient's - rights under this Agreement terminate, Recipient agrees to cease use - and distribution of the Program as soon as reasonably practicable. - However, Recipient's obligations under this Agreement and any licenses - granted by Recipient relating to the Program shall continue and survive. - - Everyone is permitted to copy and distribute copies of this Agreement, - but in order to avoid inconsistency the Agreement is copyrighted and - may only be modified in the following manner. The Agreement Steward - reserves the right to publish new versions (including revisions) of - this Agreement from time to time. No one other than the Agreement - Steward has the right to modify this Agreement. The Eclipse Foundation - is the initial Agreement Steward. The Eclipse Foundation may assign the - responsibility to serve as the Agreement Steward to a suitable separate - entity. Each new version of the Agreement will be given a distinguishing - version number. The Program (including Contributions) may always be - Distributed subject to the version of the Agreement under which it was - received. In addition, after a new version of the Agreement is published, - Contributor may elect to Distribute the Program (including its - Contributions) under the new version. - - Except as expressly stated in Sections 2(a) and 2(b) above, Recipient - receives no rights or licenses to the intellectual property of any - Contributor under this Agreement, whether expressly, by implication, - estoppel or otherwise. All rights in the Program not expressly granted - under this Agreement are reserved. Nothing in this Agreement is intended - to be enforceable by any entity that is not a Contributor or Recipient. - No third-party beneficiary rights are created under this Agreement. - - Exhibit A - Form of Secondary Licenses Notice - - "This Source Code may also be made available under the following - Secondary Licenses when the conditions for such availability set forth - in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), - version(s), and exceptions or additional permissions here}." - - Simply including a copy of this Agreement, including this Exhibit A - is not sufficient to license the Source Code under Secondary Licenses. - - If it is not possible or desirable to put the notice in a particular - file, then You may include the notice in a location (such as a LICENSE - file in a relevant directory) where a recipient would be likely to - look for such a notice. - - You may add additional accurate notices of copyright ownership. - ---- - -## The GNU General Public License (GPL) Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor - Boston, MA 02110-1335 - USA - - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your freedom to - share and change it. By contrast, the GNU General Public License is - intended to guarantee your freedom to share and change free software--to - make sure the software is free for all its users. This General Public - License applies to most of the Free Software Foundation's software and - to any other program whose authors commit to using it. (Some other Free - Software Foundation software is covered by the GNU Library General - Public License instead.) You can apply it to your programs, too. - - When we speak of free software, we are referring to freedom, not price. - Our General Public Licenses are designed to make sure that you have the - freedom to distribute copies of free software (and charge for this - service if you wish), that you receive source code or can get it if you - want it, that you can change the software or use pieces of it in new - free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid anyone - to deny you these rights or to ask you to surrender the rights. These - restrictions translate to certain responsibilities for you if you - distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether gratis - or for a fee, you must give the recipients all the rights that you have. - You must make sure that they, too, receive or can get the source code. - And you must show them these terms so they know their rights. - - We protect your rights with two steps: (1) copyright the software, and - (2) offer you this license which gives you legal permission to copy, - distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain - that everyone understands that there is no warranty for this free - software. If the software is modified by someone else and passed on, we - want its recipients to know that what they have is not the original, so - that any problems introduced by others will not reflect on the original - authors' reputations. - - Finally, any free program is threatened constantly by software patents. - We wish to avoid the danger that redistributors of a free program will - individually obtain patent licenses, in effect making the program - proprietary. To prevent this, we have made it clear that any patent must - be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and - modification follow. - - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains a - notice placed by the copyright holder saying it may be distributed under - the terms of this General Public License. The "Program", below, refers - to any such program or work, and a "work based on the Program" means - either the Program or any derivative work under copyright law: that is - to say, a work containing the Program or a portion of it, either - verbatim or with modifications and/or translated into another language. - (Hereinafter, translation is included without limitation in the term - "modification".) Each licensee is addressed as "you". - - Activities other than copying, distribution and modification are not - covered by this License; they are outside its scope. The act of running - the Program is not restricted, and the output from the Program is - covered only if its contents constitute a work based on the Program - (independent of having been made by running the Program). Whether that - is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's source - code as you receive it, in any medium, provided that you conspicuously - and appropriately publish on each copy an appropriate copyright notice - and disclaimer of warranty; keep intact all the notices that refer to - this License and to the absence of any warranty; and give any other - recipients of the Program a copy of this License along with the Program. - - You may charge a fee for the physical act of transferring a copy, and - you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion of - it, thus forming a work based on the Program, and copy and distribute - such modifications or work under the terms of Section 1 above, provided - that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any part - thereof, to be licensed as a whole at no charge to all third parties - under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a notice - that there is no warranty (or else, saying that you provide a - warranty) and that users may redistribute the program under these - conditions, and telling the user how to view a copy of this License. - (Exception: if the Program itself is interactive but does not - normally print such an announcement, your work based on the Program - is not required to print an announcement.) - - These requirements apply to the modified work as a whole. If - identifiable sections of that work are not derived from the Program, and - can be reasonably considered independent and separate works in - themselves, then this License, and its terms, do not apply to those - sections when you distribute them as separate works. But when you - distribute the same sections as part of a whole which is a work based on - the Program, the distribution of the whole must be on the terms of this - License, whose permissions for other licensees extend to the entire - whole, and thus to each and every part regardless of who wrote it. - - Thus, it is not the intent of this section to claim rights or contest - your rights to work written entirely by you; rather, the intent is to - exercise the right to control the distribution of derivative or - collective works based on the Program. - - In addition, mere aggregation of another work not based on the Program - with the Program (or with a work based on the Program) on a volume of a - storage or distribution medium does not bring the other work under the - scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, - under Section 2) in object code or executable form under the terms of - Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections 1 - and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your cost - of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to - distribute corresponding source code. (This alternative is allowed - only for noncommercial distribution and only if you received the - program in object code or executable form with such an offer, in - accord with Subsection b above.) - - The source code for a work means the preferred form of the work for - making modifications to it. For an executable work, complete source code - means all the source code for all modules it contains, plus any - associated interface definition files, plus the scripts used to control - compilation and installation of the executable. However, as a special - exception, the source code distributed need not include anything that is - normally distributed (in either source or binary form) with the major - components (compiler, kernel, and so on) of the operating system on - which the executable runs, unless that component itself accompanies the - executable. - - If distribution of executable or object code is made by offering access - to copy from a designated place, then offering equivalent access to copy - the source code from the same place counts as distribution of the source - code, even though third parties are not compelled to copy the source - along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program - except as expressly provided under this License. Any attempt otherwise - to copy, modify, sublicense or distribute the Program is void, and will - automatically terminate your rights under this License. However, parties - who have received copies, or rights, from you under this License will - not have their licenses terminated so long as such parties remain in - full compliance. - - 5. You are not required to accept this License, since you have not - signed it. However, nothing else grants you permission to modify or - distribute the Program or its derivative works. These actions are - prohibited by law if you do not accept this License. Therefore, by - modifying or distributing the Program (or any work based on the - Program), you indicate your acceptance of this License to do so, and all - its terms and conditions for copying, distributing or modifying the - Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the - Program), the recipient automatically receives a license from the - original licensor to copy, distribute or modify the Program subject to - these terms and conditions. You may not impose any further restrictions - on the recipients' exercise of the rights granted herein. You are not - responsible for enforcing compliance by third parties to this License. - - 7. If, as a consequence of a court judgment or allegation of patent - infringement or for any other reason (not limited to patent issues), - conditions are imposed on you (whether by court order, agreement or - otherwise) that contradict the conditions of this License, they do not - excuse you from the conditions of this License. If you cannot distribute - so as to satisfy simultaneously your obligations under this License and - any other pertinent obligations, then as a consequence you may not - distribute the Program at all. For example, if a patent license would - not permit royalty-free redistribution of the Program by all those who - receive copies directly or indirectly through you, then the only way you - could satisfy both it and this License would be to refrain entirely from - distribution of the Program. - - If any portion of this section is held invalid or unenforceable under - any particular circumstance, the balance of the section is intended to - apply and the section as a whole is intended to apply in other - circumstances. - - It is not the purpose of this section to induce you to infringe any - patents or other property right claims or to contest validity of any - such claims; this section has the sole purpose of protecting the - integrity of the free software distribution system, which is implemented - by public license practices. Many people have made generous - contributions to the wide range of software distributed through that - system in reliance on consistent application of that system; it is up to - the author/donor to decide if he or she is willing to distribute - software through any other system and a licensee cannot impose that choice. - - This section is intended to make thoroughly clear what is believed to be - a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in - certain countries either by patents or by copyrighted interfaces, the - original copyright holder who places the Program under this License may - add an explicit geographical distribution limitation excluding those - countries, so that distribution is permitted only in or among countries - not thus excluded. In such case, this License incorporates the - limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new - versions of the 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 Program - specifies a version number of this License which applies to it and "any - later version", you have the option of following the terms and - conditions either of that version or of any later version published by - the Free Software Foundation. If the Program does not specify a version - number of this License, you may choose any version ever published by the - Free Software Foundation. - - 10. If you wish to incorporate parts of the Program into other free - programs whose distribution conditions are different, write to the - author to ask for permission. For software which is copyrighted by the - Free Software Foundation, write to the Free Software Foundation; we - sometimes make exceptions for this. Our decision will be guided by the - two goals of preserving the free status of all derivatives of our free - software and of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO - WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. - EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR - OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, - EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE - ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH - YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL - NECESSARY SERVICING, REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN - WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY - AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR - DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL - DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM - (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED - INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF - THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR - OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest - possible use to the public, the best way to achieve this is to make it - free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest to - attach them to the start of each source file to most effectively convey - the exclusion of warranty; and each file should have at least the - "copyright" line and a pointer to where the full notice is found. - - One line to give the program's name and a brief idea of what it does. - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA - - Also add information on how to contact you by electronic and paper mail. - - If the program is interactive, make it output a short notice like this - when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type - `show w'. This is free software, and you are welcome to redistribute - it under certain conditions; type `show c' for details. - - The hypothetical commands `show w' and `show c' should show the - appropriate parts of the General Public License. Of course, the commands - you use may be called something other than `show w' and `show c'; they - could even be mouse-clicks or menu items--whatever suits your program. - - You should also get your employer (if you work as a programmer) or your - school, if any, to sign a "copyright disclaimer" for the program, if - necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - program `Gnomovision' (which makes passes at compilers) written by - James Hacker. - - signature of Ty Coon, 1 April 1989 - Ty Coon, President of Vice - - This General Public License does not permit incorporating your program - into proprietary programs. If your program is a subroutine library, you - may consider it more useful to permit linking proprietary applications - with the library. If this is what you want to do, use the GNU Library - General Public License instead of this License. - ---- - -## CLASSPATH EXCEPTION - - Linking this library statically or dynamically with other modules is - making a combined work based on this library. Thus, the terms and - conditions of the GNU General Public License version 2 cover the whole - combination. - - As a special exception, the copyright holders of this library give you - permission to link this library with independent modules to produce an - executable, regardless of the license terms of these independent - modules, and to copy and distribute the resulting executable under - terms of your choice, provided that you also meet, for each linked - independent module, the terms and conditions of the license of that - module. An independent module is a module which is not derived from or - based on this library. If you modify this library, you may extend this - exception to your version of the library, but you are not obligated to - do so. If you do not wish to do so, delete this exception statement - from your version. \ No newline at end of file diff --git a/pom.xml b/pom.xml index bc1567a994..8eefa1b70f 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.2 + 4.0.3 org.apache.hertzbeat @@ -99,7 +99,7 @@ 1.8.0 - 17 + 21 ${java.version} ${java.version} 3.2.0 @@ -107,8 +107,8 @@ 2.1.1 - 3.8.1 - 2.22.2 + 3.15.0 + 3.2.5 3.21.0 UTF-8 @@ -126,11 +126,12 @@ 2.9.3 4.5.14 - 1.18.32 + 1.18.42 2.0.9 + 3.1.0 2.3.0 2.2 - 4.12.0 + 5.3.2 3.7.1 4.1.117.Final 8.4.0 @@ -164,7 +165,6 @@ 1.4.5 2.2.1 3.6.0 - 4.0.2 1.0.0 1.1.0 3.1.37 @@ -181,9 +181,10 @@ 18.1.0 1.1.10.7 2.13.1 - 2.15.0 - 2.14.0-alpha + 2.25.0 + 2.25.0-alpha 1.3.1-alpha + @@ -321,6 +322,41 @@ protobuf-java ${protobuf.version} + + tools.jackson.core + jackson-databind + ${jackson.version} + + + tools.jackson.core + jackson-core + ${jackson.version} + + + tools.jackson.core + jackson-annotations + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + 2.21 + + + tools.jackson.dataformat + jackson-dataformat-xml + ${jackson.version} + + + tools.jackson.dataformat + jackson-dataformat-yaml + ${jackson.version} + + + + + + commons-net @@ -476,6 +512,11 @@ okhttp ${okhttp.version} + + com.squareup.okhttp3 + logging-interceptor + ${okhttp.version} + com.github.ben-manes.caffeine diff --git a/script/application.yml b/script/application.yml index 85ff831d59..1203a679b1 100644 --- a/script/application.yml +++ b/script/application.yml @@ -40,11 +40,6 @@ spring: static-locations: - classpath:/dist/ - classpath:../dist/ - # need to disable spring boot mongodb auto config, or default mongodb connection tried and failed. - autoconfigure: - exclude: org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration, org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration - freemarker: - enabled: false servlet: multipart: max-file-size: 100MB @@ -62,7 +57,8 @@ management: - 'metrics' - 'health' - 'prometheus' - enabled-by-default: on + access: + default: read_only endpoint: prometheus: access: read_only @@ -103,12 +99,13 @@ spring: jpa: show-sql: false - database-platform: org.eclipse.persistence.platform.database.MySQLPlatform database: h2 + hibernate: + ddl-auto: update properties: - eclipselink: - logging: - level: SEVERE + hibernate: + dialect: org.hibernate.dialect.H2Dialect + format_sql: true flyway: enabled: true @@ -225,6 +222,38 @@ warehouse: password: root expire-time: '30d' replication: 1 + doris: + enabled: false + url: jdbc:mysql://127.0.0.1:9030 + username: root + password: + table-config: + enable-partition: false + partition-time-unit: DAY + partition-retention-days: 30 + partition-future-days: 3 + buckets: 8 + replication-num: 1 + pool-config: + minimum-idle: 5 + maximum-pool-size: 20 + connection-timeout: 30000 + write-config: + # Write mode: jdbc (default, suitable for small/medium scale) or stream (high throughput) + write-mode: jdbc + # JDBC mode: batch size and flush interval + batch-size: 1000 + flush-interval: 5 + # Stream Load mode configuration (only used when write-mode: stream) + stream-load-config: + # Doris FE HTTP port for Stream Load API + http-port: :8030 + # Stream load timeout in seconds + timeout: 60 + # Max batch size in bytes for stream load (10MB default) + max-bytes-per-batch: 10485760 + # Redirect policy in complex networks: direct/public/private, empty means Doris default + redirect-policy: "" # store real-time metrics data, enable only one below real-time: memory: diff --git a/script/assembly/collector/bin/startup.sh b/script/assembly/collector/bin/startup.sh index 260a73b8b2..1d2db5f9c2 100644 --- a/script/assembly/collector/bin/startup.sh +++ b/script/assembly/collector/bin/startup.sh @@ -103,7 +103,7 @@ if [ -f "./java/bin/java" ]; then else JAVA_EXIST=`which java | grep bin | wc -l` if [ $JAVA_EXIST -le 0 ]; then - echo -e "ERROR: there is no java17+ environment, please config java environment." + echo -e "ERROR: there is no java21+ environment, please config java environment." exit 1 fi echo -e "Use the system environment jdk to start" diff --git a/script/assembly/server/bin/startup.sh b/script/assembly/server/bin/startup.sh index f6b63db4f8..ebf25d7ae3 100644 --- a/script/assembly/server/bin/startup.sh +++ b/script/assembly/server/bin/startup.sh @@ -107,7 +107,7 @@ if [ -f "./java/bin/java" ]; then else JAVA_EXIST=`which java | grep bin | wc -l` if [ $JAVA_EXIST -le 0 ]; then - echo -e "ERROR: there is no java17+ environment, please config java environment." + echo -e "ERROR: there is no java21+ environment, please config java environment." exit 1 fi echo -e "Use the system environment jdk to start" diff --git a/script/ci/github-actions/setup-deps/action.yml b/script/ci/github-actions/setup-deps/action.yml index ae1386dce3..0e1698fe72 100644 --- a/script/ci/github-actions/setup-deps/action.yml +++ b/script/ci/github-actions/setup-deps/action.yml @@ -21,11 +21,11 @@ description: Install host system dependencies (with mvnd) runs: using: composite steps: - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: distribution: "zulu" - java-version: 17 + java-version: 21 - name: Install mvnd shell: bash diff --git a/script/docker-compose/hertzbeat-mysql-iotdb/conf/application.yml b/script/docker-compose/hertzbeat-mysql-iotdb/conf/application.yml index feceab674d..2ee7136255 100644 --- a/script/docker-compose/hertzbeat-mysql-iotdb/conf/application.yml +++ b/script/docker-compose/hertzbeat-mysql-iotdb/conf/application.yml @@ -102,12 +102,13 @@ spring: max-lifetime: 120000 jpa: show-sql: false - database-platform: org.eclipse.persistence.platform.database.MySQLPlatform database: mysql + hibernate: + ddl-auto: update properties: - eclipselink: - logging: - level: SEVERE + hibernate: + format_sql: true + dialect: org.hibernate.dialect.MySQLDialect flyway: enabled: true diff --git a/script/docker-compose/hertzbeat-mysql-tdengine/conf/application.yml b/script/docker-compose/hertzbeat-mysql-tdengine/conf/application.yml index 31776c5218..b4c195c22f 100644 --- a/script/docker-compose/hertzbeat-mysql-tdengine/conf/application.yml +++ b/script/docker-compose/hertzbeat-mysql-tdengine/conf/application.yml @@ -102,12 +102,13 @@ spring: max-lifetime: 120000 jpa: show-sql: false - database-platform: org.eclipse.persistence.platform.database.MySQLPlatform database: mysql + hibernate: + ddl-auto: update properties: - eclipselink: - logging: - level: SEVERE + hibernate: + format_sql: true + dialect: org.hibernate.dialect.MySQLDialect flyway: enabled: true diff --git a/script/docker-compose/hertzbeat-mysql-victoria-metrics/conf/application.yml b/script/docker-compose/hertzbeat-mysql-victoria-metrics/conf/application.yml index 30137ac088..c81a69107f 100644 --- a/script/docker-compose/hertzbeat-mysql-victoria-metrics/conf/application.yml +++ b/script/docker-compose/hertzbeat-mysql-victoria-metrics/conf/application.yml @@ -102,12 +102,13 @@ spring: max-lifetime: 120000 jpa: show-sql: false - database-platform: org.eclipse.persistence.platform.database.MySQLPlatform database: mysql + hibernate: + ddl-auto: update properties: - eclipselink: - logging: - level: SEVERE + hibernate: + format_sql: true + dialect: org.hibernate.dialect.MySQLDialect flyway: enabled: true diff --git a/script/docker-compose/hertzbeat-postgresql-greptimedb/conf/application.yml b/script/docker-compose/hertzbeat-postgresql-greptimedb/conf/application.yml index bd4fa8f29b..a479216209 100644 --- a/script/docker-compose/hertzbeat-postgresql-greptimedb/conf/application.yml +++ b/script/docker-compose/hertzbeat-postgresql-greptimedb/conf/application.yml @@ -101,12 +101,13 @@ spring: max-lifetime: 120000 jpa: show-sql: false - database-platform: org.eclipse.persistence.platform.database.PostgreSQLPlatform database: postgresql + hibernate: + ddl-auto: update properties: - eclipselink: - logging: - level: SEVERE + hibernate: + format_sql: true + dialect: org.hibernate.dialect.PostgreSQLDialect flyway: enabled: true diff --git a/script/docker-compose/hertzbeat-postgresql-victoria-metrics/conf/application.yml b/script/docker-compose/hertzbeat-postgresql-victoria-metrics/conf/application.yml index 24fc28223d..d071e395be 100644 --- a/script/docker-compose/hertzbeat-postgresql-victoria-metrics/conf/application.yml +++ b/script/docker-compose/hertzbeat-postgresql-victoria-metrics/conf/application.yml @@ -101,12 +101,13 @@ spring: max-lifetime: 120000 jpa: show-sql: false - database-platform: org.eclipse.persistence.platform.database.PostgreSQLPlatform database: postgresql + hibernate: + ddl-auto: update properties: - eclipselink: - logging: - level: SEVERE + hibernate: + format_sql: true + dialect: org.hibernate.dialect.PostgreSQLDialect flyway: enabled: true