This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new 9c67f6656 [SCB-2814]remove servicestage-environment module (#3991)
9c67f6656 is described below
commit 9c67f6656cfdde34812127fb2740e67f9eb3a19a
Author: liubao68 <[email protected]>
AuthorDate: Mon Oct 23 17:47:14 2023 +0800
[SCB-2814]remove servicestage-environment module (#3991)
---
coverage-reports/pom.xml | 4 --
demo/demo-cse-v1/pom.xml | 4 --
demo/demo-cse-v2/pom.xml | 4 --
dependencies/bom/pom.xml | 5 ---
distribution/pom.xml | 5 ---
huawei-cloud/environment/README.md | 20 ----------
huawei-cloud/environment/pom.xml | 41 ---------------------
.../environment/src/main/resources/mapping.yaml | 43 ----------------------
huawei-cloud/pom.xml | 1 -
9 files changed, 127 deletions(-)
diff --git a/coverage-reports/pom.xml b/coverage-reports/pom.xml
index 3199b48bc..ee32cc38a 100644
--- a/coverage-reports/pom.xml
+++ b/coverage-reports/pom.xml
@@ -234,10 +234,6 @@
</dependency>
<!-- ServiceComb ServiceStage extension -->
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>servicestage-environment</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
<artifactId>servicestage</artifactId>
diff --git a/demo/demo-cse-v1/pom.xml b/demo/demo-cse-v1/pom.xml
index ef083a005..b49ea7f29 100644
--- a/demo/demo-cse-v1/pom.xml
+++ b/demo/demo-cse-v1/pom.xml
@@ -49,10 +49,6 @@
<groupId>org.apache.servicecomb</groupId>
<artifactId>config-cc</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>servicestage-environment</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
<artifactId>servicestage</artifactId>
diff --git a/demo/demo-cse-v2/pom.xml b/demo/demo-cse-v2/pom.xml
index 06849c1b8..49c233ad4 100644
--- a/demo/demo-cse-v2/pom.xml
+++ b/demo/demo-cse-v2/pom.xml
@@ -37,10 +37,6 @@
<groupId>org.apache.servicecomb</groupId>
<artifactId>registry-service-center</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>servicestage-environment</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
diff --git a/dependencies/bom/pom.xml b/dependencies/bom/pom.xml
index 2eeda755d..244b9f898 100644
--- a/dependencies/bom/pom.xml
+++ b/dependencies/bom/pom.xml
@@ -286,11 +286,6 @@
<version>${project.version}</version>
</dependency>
<!-- ServiceComb ServiceStage extension -->
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>servicestage-environment</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.servicecomb</groupId>
<artifactId>servicestage</artifactId>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 5cdacc18b..1cdad0e4e 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -240,11 +240,6 @@
</dependency>
<!-- ServiceComb ServiceStage extension -->
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>servicestage-environment</artifactId>
- </dependency>
-
<dependency>
<groupId>org.apache.servicecomb</groupId>
<artifactId>servicestage</artifactId>
diff --git a/huawei-cloud/environment/README.md
b/huawei-cloud/environment/README.md
deleted file mode 100644
index 3267331c6..000000000
--- a/huawei-cloud/environment/README.md
+++ /dev/null
@@ -1,20 +0,0 @@
-这个模块主要提供 servicestage 部署环境变量和配置项的映射，通过这种方式可以简化配置。
-
-servicestage 存在环境、应用、组件等概念，这些内容都是在部署的时候输入，可以将这些内容用于微服务的配置信息。
-
-|概念|环境变量|微服务配置项|
-| :--- | :--- | :--- |
-|应用|CAS_APPLICATION_NAME|servicecomb.service.application|
-|组件|CAS_COMPONENT_NAME|servicecomb.service.name|
-|组件版本|CAS_INSTANCE_VERSION|servicecomb.service.version|
-
-部署的过程还会注入环境里面的资源信息。
-
-|概念|环境变量|微服务配置项|
-| :--- | :--- | :--- |
-|服务/配置中心地址（逻辑多租，APIG场景）| PAAS_CSE_ENDPOINT |
servicecomb.registry.sc.address<br/>servicecomb.config.client.serverUri|
-|服务中心地址 | PAAS_CSE_SC_ENDPOINT | servicecomb.registry.sc.address |
-|配置中心地址 | PAAS_CSE_CC_ENDPOINT | servicecomb.config.client.serverUri |
-|项目（区域） | PAAS_PROJECT_NAME | servicecomb.credentials.project |
-
-
diff --git a/huawei-cloud/environment/pom.xml b/huawei-cloud/environment/pom.xml
deleted file mode 100644
index 57cba6689..000000000
--- a/huawei-cloud/environment/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <parent>
- <artifactId>huawei-cloud</artifactId>
- <groupId>org.apache.servicecomb</groupId>
- <version>3.0.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>servicestage-environment</artifactId>
- <name>Java Chassis::Huawei Cloud::ServiceStage</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>java-chassis-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicecomb</groupId>
- <artifactId>registry-service-center</artifactId>
- </dependency>
- </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/huawei-cloud/environment/src/main/resources/mapping.yaml
b/huawei-cloud/environment/src/main/resources/mapping.yaml
deleted file mode 100644
index 05c3fa1c4..000000000
--- a/huawei-cloud/environment/src/main/resources/mapping.yaml
+++ /dev/null
@@ -1,43 +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.
-#
-servicecomb-config-order: -100
-
-PAAS_CSE_ENDPOINT:
- - servicecomb.registry.sc.address
- - servicecomb.config.client.serverUri
- - servicecomb.monitor.client.serverUri
-PAAS_CSE_SC_ENDPOINT:
- - servicecomb.registry.sc.address
-PAAS_CSE_CC_ENDPOINT:
- - servicecomb.config.client.serverUri
-PAAS_CSE_DS_ENDPOINT:
- - servicecomb.monitor.client.serverUri
-PAAS_PROJECT_NAME:
- - servicecomb.credentials.project
-
-## other possible and useful mappings
-
-#CAS_APPLICATION_NAME:
-# - servicecomb.service.application
-#CAS_COMPONENT_NAME:
-# - servicecomb.service.name
-#CAS_INSTANCE_VERSION:
-# - servicecomb.service.version
-#SERVICECOMB_SERVICE_PROPS:
-# - servicecomb.service.properties
-#SERVICECOMB_INSTANCE_PROPS:
-# - servicecomb.instance.properties
diff --git a/huawei-cloud/pom.xml b/huawei-cloud/pom.xml
index 148a37aec..9e36c6d7d 100644
--- a/huawei-cloud/pom.xml
+++ b/huawei-cloud/pom.xml
@@ -32,7 +32,6 @@
<modules>
<module>servicestage</module>
- <module>environment</module>
<module>dashboard</module>
<module>darklaunch</module>
</modules>
