You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eventmesh.apache.org by we...@apache.org on 2022/06/23 08:59:18 UTC
[incubator-eventmesh] branch master updated: Add nacos into distribution (#948)
This is an automated email from the ASF dual-hosted git repository.
wenjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-eventmesh.git
The following commit(s) were added to refs/heads/master by this push:
new 0e5c29f1 Add nacos into distribution (#948)
0e5c29f1 is described below
commit 0e5c29f1d057b56a24c37fa1736ecc4619142979
Author: Wenjun Ruan <we...@apache.org>
AuthorDate: Thu Jun 23 16:59:14 2022 +0800
Add nacos into distribution (#948)
---
.github/workflows/ci.yml | 2 +-
CONTRIBUTING.md | 2 +-
CONTRIBUTING.zh-CN.md | 2 +-
eventmesh-admin/build.gradle | 20 --------------------
.../eventmesh-registry-nacos/gradle.properties | 19 +++++++++++++++++++
.../check-dependencies.sh | 8 ++++----
.../known-dependencies.txt | 0
7 files changed, 26 insertions(+), 27 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b5208794..ba27e41b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -79,4 +79,4 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Check third party dependencies
- run: ./gradlew clean jar dist && ./gradlew installPlugin && ./gradlew tar && sh tools/third-party-dependencies/check-dependencies.sh && echo "Thirty party dependencies check success"
+ run: ./gradlew clean jar dist && ./gradlew installPlugin && ./gradlew tar && sh tools/dependency-checck/check-dependencies.sh && echo "Thirty party dependencies check success"
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8c34df7a..a4219d29 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -92,7 +92,7 @@ EventMesh follows [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.
have the Apache License header added to the file header. EventMesh uses the [apache/skywalking-eyes](https://github.com/apache/skywalking-eyes) to check
the source file header.
-EventMesh uses [check-dependencies.sh](tools/third-party-dependencies/check-dependencies.sh) script to check for third-part dependencies.
+EventMesh uses [check-dependencies.sh](tools/dependency-checck/check-dependencies.sh) script to check for third-part dependencies.
When you need to add a three-part dependency, you need to register the newly added dependency in tool/license/known-dependencies.txt. The newly added three-part libraries need to meet [ASF 3RD PARTY LICENSE POLICY](https://apache.org/legal/resolved.html).
It is highly recommended communicating with EventMesh community before you need to add a three-part library.
diff --git a/CONTRIBUTING.zh-CN.md b/CONTRIBUTING.zh-CN.md
index dd6bc64a..c19cf212 100644
--- a/CONTRIBUTING.zh-CN.md
+++ b/CONTRIBUTING.zh-CN.md
@@ -81,7 +81,7 @@ EventMesh遵循[Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0.h
所有的源代码文件应该在文件头部添加Apache License header，EventMesh会使用[apache/skywalking-eyes](https://github.com/apache/skywalking-eyes)
对源代码文件头进行校验。
-EventMesh使用[check-dependencies.sh](tools/third-party-dependencies/check-dependencies.sh)脚本
+EventMesh使用[check-dependencies.sh](tools/dependency-checck/check-dependencies.sh)脚本
检查第三方依赖，当你需要添加三方依赖时，你需要将新添加的依赖注册在tool/license/known-dependencies.txt中，
同时新添加的三方库需要满足[Apache对于第三方的政策](https://apache.org/legal/resolved.html)。
diff --git a/eventmesh-admin/build.gradle b/eventmesh-admin/build.gradle
index 1f443612..2944f981 100644
--- a/eventmesh-admin/build.gradle
+++ b/eventmesh-admin/build.gradle
@@ -14,23 +14,3 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-task copyEventMeshAdmin(dependsOn: ['jar']) {
- doFirst {
- new File(projectDir, '../eventmesh-admin/dist/apps').mkdir()
- new File(projectDir, '../dist/admin/').mkdirs()
- }
- doLast {
- copy {
- into('../eventmesh-admin/dist/apps/')
- from project.jar.getArchivePath()
- exclude {
- "eventmesh-admin-${version}.jar"
- }
- }
- copy {
- into '../dist/admin'
- from "../eventmesh-admin/dist/apps/eventmesh-admin-rocketmq-${version}.jar"
- }
- }
-}
\ No newline at end of file
diff --git a/eventmesh-registry-plugin/eventmesh-registry-nacos/gradle.properties b/eventmesh-registry-plugin/eventmesh-registry-nacos/gradle.properties
new file mode 100644
index 00000000..dc23fa1f
--- /dev/null
+++ b/eventmesh-registry-plugin/eventmesh-registry-nacos/gradle.properties
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+
+pluginType=registry
+pluginName=nacos
\ No newline at end of file
diff --git a/tools/third-party-dependencies/check-dependencies.sh b/tools/dependency-checck/check-dependencies.sh
similarity index 85%
rename from tools/third-party-dependencies/check-dependencies.sh
rename to tools/dependency-checck/check-dependencies.sh
index 8addbd65..b54d2d95 100644
--- a/tools/third-party-dependencies/check-dependencies.sh
+++ b/tools/dependency-checck/check-dependencies.sh
@@ -24,15 +24,15 @@
# Used to store the tmp files.
decompress_conf='build/tmp'
# store all dependencies from our binary jar.
-all_dependencies_txt='tools/third-party-dependencies/all-dependencies.txt'
+all_dependencies_txt='tools/dependency-checck/all-dependencies.txt'
# store all our known dependencies
-known_third_party_dependencies_txt='tools/third-party-dependencies/known-dependencies.txt'
+known_third_party_dependencies_txt='tools/dependency-checck/known-dependencies.txt'
# Below files is generated by this script.
# store all EventMesh self module's name.
-self_modules_txt='tools/third-party-dependencies/self-modules.txt'
+self_modules_txt='tools/dependency-checck/self-modules.txt'
# store all third part dependencies
-third_party_dependencies_txt='tools/third-party-dependencies/third-party-dependencies.txt'
+third_party_dependencies_txt='tools/dependency-checck/third-party-dependencies.txt'
mkdir $decompress_conf || true
tar -zxf build/EventMesh*.tar.gz -C $decompress_conf
diff --git a/tools/third-party-dependencies/known-dependencies.txt b/tools/dependency-checck/known-dependencies.txt
similarity index 100%
rename from tools/third-party-dependencies/known-dependencies.txt
rename to tools/dependency-checck/known-dependencies.txt
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@eventmesh.apache.org
For additional commands, e-mail: commits-help@eventmesh.apache.org