Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix conflicts and update the code #635

Merged
merged 35 commits into from
Dec 8, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
f288ae2
Add files via upload
qqeasonchen Nov 3, 2021
09b9a22
Update README.md
qqeasonchen Nov 3, 2021
90a28cc
[ISSUE #580] Add checkstyle gradle plugin (#581)
ruanwenjun Nov 10, 2021
9251e07
update wechat-official qr code
xwm1992 Nov 11, 2021
ff1c247
update mesh-helper qr code
xwm1992 Nov 11, 2021
00994c3
Add files via upload
qqeasonchen Nov 11, 2021
bcf0337
update README.md
xwm1992 Nov 11, 2021
4938cd7
update README.md
xwm1992 Nov 11, 2021
61d0410
Update .asf.yaml
qqeasonchen Nov 11, 2021
ceaf33b
[ISSUE #588] Fix typo in README.md (#589)
nichozhan Nov 15, 2021
46f973d
[Bug #590] Consumer subscription topic is invalid (#590) (#592)
hagsyn Nov 16, 2021
f8ffb44
fixed a wrong url in cn-doc (#585)
sarihuangshanrong Nov 19, 2021
0acafcc
resolve_exception->Consumer subscription topic is invalid #590 (#598)
hagsyn Nov 19, 2021
e53acaf
Update eventmesh-store-quickstart.md
qqeasonchen Nov 21, 2021
4f04d9d
Update README.md
qqeasonchen Nov 21, 2021
71bcb09
Add slack icon (#601)
ruanwenjun Nov 21, 2021
f3b9520
eventmesh-admin-rocketmq submodule and createTopic REST API (#530)
yzhao244 Nov 29, 2021
232080e
create topic command (#531)
yzhao244 Nov 30, 2021
69fab8f
Update README.md
qqeasonchen Nov 30, 2021
6b1f25b
Safely delete useless log4j dependencies
vongosling Dec 8, 2021
92287b0
Safely delete outdated metrics dependencies
vongosling Dec 8, 2021
9e07445
Sately delete useless collections4 dependency
vongosling Dec 8, 2021
d45028c
Safely delete useless commons dependencies
vongosling Dec 8, 2021
a96e218
Reback to the collections4, but let it not in api dependency
vongosling Dec 8, 2021
6f2368e
Could not remove text for Safe Ramdom implementation
vongosling Dec 8, 2021
2772704
Fix build error
vongosling Dec 8, 2021
5e5de4a
Add collection4
vongosling Dec 8, 2021
56f1172
Fix build error
vongosling Dec 8, 2021
751e1ca
Revert "Safely delete outdated metrics dependencies"
vongosling Dec 8, 2021
7405376
Change to api dependency
vongosling Dec 8, 2021
b65580b
Remove doclint warnings
vongosling Dec 8, 2021
961d998
Depracated checkstyle check error temporarily, we should remove it wh…
vongosling Dec 8, 2021
79fdb12
Update .asf.yaml
qqeasonchen Dec 8, 2021
20ab726
Update .asf.yaml
qqeasonchen Dec 8, 2021
766337a
Merge branch 'develop' of https://github.com/apache/incubator-eventme…
xwm1992 Dec 8, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert "Safely delete outdated metrics dependencies"
This reverts commit 92287b0.
  • Loading branch information
vongosling committed Dec 8, 2021
commit 751e1cabd9ad7fdfb55cf3e86d4110acd64fb260
5 changes: 5 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,11 @@ subprojects {

dependency "io.netty:netty-all:4.1.49.Final"

dependency 'io.dropwizard.metrics:metrics-core:4.1.0'
dependency "io.dropwizard.metrics:metrics-healthchecks:4.1.0"
dependency "io.dropwizard.metrics:metrics-annotation:4.1.0"
dependency "io.dropwizard.metrics:metrics-json:4.1.0"

dependency 'io.opentelemetry:opentelemetry-api:1.3.0'
dependency 'io.opentelemetry:opentelemetry-sdk:1.3.0'
dependency 'io.opentelemetry:opentelemetry-sdk-metrics:1.3.0-alpha'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,16 @@ dependencies {
implementation project(":eventmesh-spi")
implementation project(":eventmesh-common")
api 'io.openmessaging:openmessaging-api'
api 'io.dropwizard.metrics:metrics-core'
api "io.dropwizard.metrics:metrics-healthchecks"
api "io.dropwizard.metrics:metrics-annotation"
api "io.dropwizard.metrics:metrics-json"

testImplementation project(":eventmesh-spi")
testImplementation project(":eventmesh-common")
testImplementation 'io.openmessaging:openmessaging-api'
testImplementation 'io.dropwizard.metrics:metrics-core'
testImplementation "io.dropwizard.metrics:metrics-healthchecks"
testImplementation "io.dropwizard.metrics:metrics-annotation"
testImplementation "io.dropwizard.metrics:metrics-json"
}