From 8d156b2f4183f850d3656d49f39038f6d96199a8 Mon Sep 17 00:00:00 2001 From: Zhiguo Wu Date: Thu, 23 Jan 2025 16:42:05 +0800 Subject: [PATCH] BIGTOP-4333: Add license info to services --- .../org/apache/bigtop/manager/server/model/dto/ServiceDTO.java | 2 ++ .../org/apache/bigtop/manager/server/model/vo/ServiceVO.java | 2 ++ .../apache/bigtop/manager/server/stack/model/ServiceModel.java | 2 ++ .../resources/stacks/bigtop/3.3.0/services/flink/metainfo.xml | 1 + .../resources/stacks/bigtop/3.3.0/services/hadoop/metainfo.xml | 1 + .../resources/stacks/bigtop/3.3.0/services/hbase/metainfo.xml | 1 + .../resources/stacks/bigtop/3.3.0/services/hive/metainfo.xml | 1 + .../resources/stacks/bigtop/3.3.0/services/kafka/metainfo.xml | 1 + .../resources/stacks/bigtop/3.3.0/services/solr/metainfo.xml | 2 ++ .../resources/stacks/bigtop/3.3.0/services/spark/metainfo.xml | 1 + .../resources/stacks/bigtop/3.3.0/services/tez/metainfo.xml | 1 + .../stacks/bigtop/3.3.0/services/zookeeper/metainfo.xml | 1 + .../stacks/extra/1.0.0/services/seatunnel/metainfo.xml | 1 + .../resources/stacks/infra/1.0.0/services/grafana/metainfo.xml | 1 + .../resources/stacks/infra/1.0.0/services/mysql/metainfo.xml | 1 + .../stacks/infra/1.0.0/services/prometheus/metainfo.xml | 1 + 16 files changed, 20 insertions(+) diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/dto/ServiceDTO.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/dto/ServiceDTO.java index 9b42cb73..e81f6fc7 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/dto/ServiceDTO.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/dto/ServiceDTO.java @@ -35,6 +35,8 @@ public class ServiceDTO { private String user; + private String license; + private List packageSpecifics; private List components; diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/ServiceVO.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/ServiceVO.java index 185532ad..704e55a1 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/ServiceVO.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/model/vo/ServiceVO.java @@ -37,6 +37,8 @@ public class ServiceVO { private String user; + private String license; + private String stack; private Boolean restartFlag; diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/ServiceModel.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/ServiceModel.java index 00a1092d..a8ba3e3d 100644 --- a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/ServiceModel.java +++ b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/stack/model/ServiceModel.java @@ -42,6 +42,8 @@ public class ServiceModel { private String user; + private String license; + @XmlElementWrapper(name = "package-specifics") @XmlElements(@XmlElement(name = "package-specific")) private List packageSpecifics; diff --git a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/flink/metainfo.xml b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/flink/metainfo.xml index 4da4d6c7..e8304715 100644 --- a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/flink/metainfo.xml +++ b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/flink/metainfo.xml @@ -25,6 +25,7 @@ Flink is a framework and distributed processing engine for stateful computations over unbounded and bounded data streams. 1.16.2-1 flink + Apache-2.0 diff --git a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/hadoop/metainfo.xml b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/hadoop/metainfo.xml index e81dc559..e85dabc7 100644 --- a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/hadoop/metainfo.xml +++ b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/hadoop/metainfo.xml @@ -25,6 +25,7 @@ Apache Hadoop Distributed File System. 3.3.6-1 hadoop + Apache-2.0 diff --git a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/hbase/metainfo.xml b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/hbase/metainfo.xml index 13e94521..c938af7c 100644 --- a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/hbase/metainfo.xml +++ b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/hbase/metainfo.xml @@ -25,6 +25,7 @@ Apache HBase is the Hadoop database, a distributed, scalable, big data store. 2.4.17-1 hbase + Apache-2.0 diff --git a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/hive/metainfo.xml b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/hive/metainfo.xml index 7ce431aa..c1ee8246 100644 --- a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/hive/metainfo.xml +++ b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/hive/metainfo.xml @@ -29,6 +29,7 @@ 3.1.3-1 hive + Apache-2.0 diff --git a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/kafka/metainfo.xml b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/kafka/metainfo.xml index 75ed8e85..562bd378 100644 --- a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/kafka/metainfo.xml +++ b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/kafka/metainfo.xml @@ -29,6 +29,7 @@ 2.8.2-1 kafka + Apache-2.0 diff --git a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/solr/metainfo.xml b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/solr/metainfo.xml index 32c5465f..f8b2c8e6 100644 --- a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/solr/metainfo.xml +++ b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/solr/metainfo.xml @@ -27,6 +27,8 @@ 8.11.2-2 solr + Apache-2.0 + solr_instance diff --git a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/spark/metainfo.xml b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/spark/metainfo.xml index 63a3382e..b2030738 100644 --- a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/spark/metainfo.xml +++ b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/spark/metainfo.xml @@ -27,6 +27,7 @@ 3.3.4-1 spark + Apache-2.0 diff --git a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/tez/metainfo.xml b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/tez/metainfo.xml index d35a1973..1c83fdbf 100644 --- a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/tez/metainfo.xml +++ b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/tez/metainfo.xml @@ -25,6 +25,7 @@ Tez is the next generation Hadoop Query Processing framework written on top of YARN. 0.10.2-1 tez + Apache-2.0 diff --git a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/zookeeper/metainfo.xml b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/zookeeper/metainfo.xml index 7748ff51..913b576c 100644 --- a/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/zookeeper/metainfo.xml +++ b/bigtop-manager-server/src/main/resources/stacks/bigtop/3.3.0/services/zookeeper/metainfo.xml @@ -28,6 +28,7 @@ 3.7.2-1 zookeeper + Apache-2.0 diff --git a/bigtop-manager-server/src/main/resources/stacks/extra/1.0.0/services/seatunnel/metainfo.xml b/bigtop-manager-server/src/main/resources/stacks/extra/1.0.0/services/seatunnel/metainfo.xml index fc91a521..ce20e722 100644 --- a/bigtop-manager-server/src/main/resources/stacks/extra/1.0.0/services/seatunnel/metainfo.xml +++ b/bigtop-manager-server/src/main/resources/stacks/extra/1.0.0/services/seatunnel/metainfo.xml @@ -27,6 +27,7 @@ 2.3.8 seatunnel + Apache-2.0 diff --git a/bigtop-manager-server/src/main/resources/stacks/infra/1.0.0/services/grafana/metainfo.xml b/bigtop-manager-server/src/main/resources/stacks/infra/1.0.0/services/grafana/metainfo.xml index 1670a9bb..2c220c9f 100644 --- a/bigtop-manager-server/src/main/resources/stacks/infra/1.0.0/services/grafana/metainfo.xml +++ b/bigtop-manager-server/src/main/resources/stacks/infra/1.0.0/services/grafana/metainfo.xml @@ -29,6 +29,7 @@ 11.4.0 grafana + AGPL-3.0 diff --git a/bigtop-manager-server/src/main/resources/stacks/infra/1.0.0/services/mysql/metainfo.xml b/bigtop-manager-server/src/main/resources/stacks/infra/1.0.0/services/mysql/metainfo.xml index 4d9243af..302df203 100644 --- a/bigtop-manager-server/src/main/resources/stacks/infra/1.0.0/services/mysql/metainfo.xml +++ b/bigtop-manager-server/src/main/resources/stacks/infra/1.0.0/services/mysql/metainfo.xml @@ -28,6 +28,7 @@ 8.0.40 mysql + GPLv2 diff --git a/bigtop-manager-server/src/main/resources/stacks/infra/1.0.0/services/prometheus/metainfo.xml b/bigtop-manager-server/src/main/resources/stacks/infra/1.0.0/services/prometheus/metainfo.xml index b0e7b606..9b9c5136 100644 --- a/bigtop-manager-server/src/main/resources/stacks/infra/1.0.0/services/prometheus/metainfo.xml +++ b/bigtop-manager-server/src/main/resources/stacks/infra/1.0.0/services/prometheus/metainfo.xml @@ -29,6 +29,7 @@ 2.54.0 prometheus + Apache-2.0