From 132af3b318833c209ee3d15a1df360fa6beca9fe Mon Sep 17 00:00:00 2001 From: xwm1992 Date: Tue, 9 Aug 2022 10:59:04 +0800 Subject: [PATCH 1/3] [MINOR] fix license check exception --- .../gradle.properties | 19 +++++++++++ tools/dependency-check/known-dependencies.txt | 33 ++++++++++--------- 2 files changed, 36 insertions(+), 16 deletions(-) create mode 100644 eventmesh-registry-plugin/eventmesh-registry-consul/gradle.properties diff --git a/eventmesh-registry-plugin/eventmesh-registry-consul/gradle.properties b/eventmesh-registry-plugin/eventmesh-registry-consul/gradle.properties new file mode 100644 index 0000000000..3ed992f06e --- /dev/null +++ b/eventmesh-registry-plugin/eventmesh-registry-consul/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=consul \ No newline at end of file diff --git a/tools/dependency-check/known-dependencies.txt b/tools/dependency-check/known-dependencies.txt index e5ffa3edb2..aa6a068991 100644 --- a/tools/dependency-check/known-dependencies.txt +++ b/tools/dependency-check/known-dependencies.txt @@ -1,5 +1,8 @@ animal-sniffer-annotations-1.17.jar assertj-core-2.6.0.jar +bcpkix-jdk15on-1.69.jar +bcprov-jdk15on-1.69.jar +bcutil-jdk15on-1.69.jar checker-qual-3.12.0.jar cloudevents-api-2.2.0.jar cloudevents-core-2.2.0.jar @@ -14,6 +17,7 @@ commons-lang3-3.6.jar commons-logging-1.2.jar commons-text-1.9.jar commons-validator-1.7.jar +consul-api-1.4.5.jar disruptor-3.4.2.jar dledger-0.2.3.jar error_prone_annotations-2.7.1.jar @@ -28,18 +32,25 @@ grpc-protobuf-lite-1.17.1.jar grpc-stub-1.17.1.jar grpc-grpclb-1.17.1.jar gson-2.7.jar +gson-2.8.2.jar guava-31.0.1-jre.jar hamcrest-core-1.3.jar +httpasyncclient-4.1.3.jar httpclient-4.5.13.jar httpcore-4.4.13.jar +httpcore-nio-4.4.6.jar ipaddress-5.3.3.jar j2objc-annotations-1.3.jar jackson-annotations-2.13.0.jar jackson-core-2.13.0.jar jackson-databind-2.13.0.jar javassist-3.20.0-GA.jar +javassist-3.21.0-GA.jar javax.annotation-api-1.3.2.jar jcommander-1.72.jar +jetcd-core-0.3.0.jar +jetcd-common-0.3.0.jar +jetcd-resolver-0.3.0.jar jna-4.2.2.jar jsr305-3.0.2.jar junit-4.13.2.jar @@ -51,6 +62,7 @@ metrics-annotation-4.1.0.jar metrics-core-4.1.0.jar metrics-healthchecks-4.1.0.jar metrics-json-4.1.0.jar +nacos-client-2.0.4.jar netty-all-4.1.73.Final.jar netty-buffer-4.1.73.Final.jar netty-codec-4.1.73.Final.jar @@ -102,6 +114,8 @@ opentelemetry-sdk-trace-1.3.0.jar opentelemetry-semconv-1.3.0-alpha.jar proto-google-common-protos-1.0.0.jar protobuf-java-3.5.1.jar +protobuf-java-util-3.5.1.jar +reflections-0.9.11.jar rocketmq-acl-4.9.3.jar rocketmq-broker-4.9.3.jar rocketmq-client-4.9.3.jar @@ -118,23 +132,10 @@ simpleclient-0.8.1.jar simpleclient_common-0.8.1.jar simpleclient_httpserver-0.8.1.jar slf4j-api-1.7.30.jar +snakeyaml-1.23.jar +snakeyaml-1.30.jar system-rules-1.16.1.jar truth-0.30.jar zipkin-2.23.2.jar zipkin-reporter-2.16.3.jar -zipkin-sender-okhttp3-2.16.3.jar -httpasyncclient-4.1.3.jar -httpcore-nio-4.4.6.jar -javassist-3.21.0-GA.jar -nacos-client-2.0.4.jar -reflections-0.9.11.jar -snakeyaml-1.23.jar -snakeyaml-1.30.jar -bcpkix-jdk15on-1.69.jar -bcprov-jdk15on-1.69.jar -bcutil-jdk15on-1.69.jar -jetcd-core-0.3.0.jar -jetcd-common-0.3.0.jar -jetcd-resolver-0.3.0.jar -protobuf-java-util-3.5.1.jar -consul-api-1.4.5.jar \ No newline at end of file +zipkin-sender-okhttp3-2.16.3.jar \ No newline at end of file From 51519e05193835d2d0d52ed9c4612fdec9c44e31 Mon Sep 17 00:00:00 2001 From: xwm1992 Date: Tue, 9 Aug 2022 14:54:52 +0800 Subject: [PATCH 2/3] fix prometheus ut test exception --- .../src/test/resources/prometheus.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eventmesh-metrics-plugin/eventmesh-metrics-prometheus/src/test/resources/prometheus.properties b/eventmesh-metrics-plugin/eventmesh-metrics-prometheus/src/test/resources/prometheus.properties index dd5ec0b83a..d4fb5a13c3 100644 --- a/eventmesh-metrics-plugin/eventmesh-metrics-prometheus/src/test/resources/prometheus.properties +++ b/eventmesh-metrics-plugin/eventmesh-metrics-prometheus/src/test/resources/prometheus.properties @@ -15,4 +15,4 @@ # limitations under the License. # -eventMesh.metrics.prometheus.port=19091 \ No newline at end of file +eventMesh.metrics.prometheus.port=19090 \ No newline at end of file From 23309a228c493ed0a3b35571563737ea1aa447d0 Mon Sep 17 00:00:00 2001 From: xwm1992 Date: Tue, 9 Aug 2022 17:03:30 +0800 Subject: [PATCH 3/3] fix dependencies jar version --- build.gradle | 5 +++++ tools/dependency-check/known-dependencies.txt | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 4a1e684eee..dedd041caf 100644 --- a/build.gradle +++ b/build.gradle @@ -485,6 +485,11 @@ subprojects { dependency "javax.annotation:javax.annotation-api:1.3.2" dependency "com.github.seancfoley:ipaddress:5.3.3" + dependency "com.google.code.gson:gson:2.8.2" + + dependency "org.yaml:snakeyaml:1.30" + dependency "org.javassist:javassist:3.24.0-GA" + } } } diff --git a/tools/dependency-check/known-dependencies.txt b/tools/dependency-check/known-dependencies.txt index aa6a068991..6e051f5fb9 100644 --- a/tools/dependency-check/known-dependencies.txt +++ b/tools/dependency-check/known-dependencies.txt @@ -31,7 +31,6 @@ grpc-protobuf-1.17.1.jar grpc-protobuf-lite-1.17.1.jar grpc-stub-1.17.1.jar grpc-grpclb-1.17.1.jar -gson-2.7.jar gson-2.8.2.jar guava-31.0.1-jre.jar hamcrest-core-1.3.jar @@ -44,8 +43,7 @@ j2objc-annotations-1.3.jar jackson-annotations-2.13.0.jar jackson-core-2.13.0.jar jackson-databind-2.13.0.jar -javassist-3.20.0-GA.jar -javassist-3.21.0-GA.jar +javassist-3.24.0-GA.jar javax.annotation-api-1.3.2.jar jcommander-1.72.jar jetcd-core-0.3.0.jar @@ -132,7 +130,6 @@ simpleclient-0.8.1.jar simpleclient_common-0.8.1.jar simpleclient_httpserver-0.8.1.jar slf4j-api-1.7.30.jar -snakeyaml-1.23.jar snakeyaml-1.30.jar system-rules-1.16.1.jar truth-0.30.jar