This is an automated email from the ASF dual-hosted git repository. mikexue pushed a commit to branch eventmesh-function in repository https://gitbox.apache.org/repos/asf/eventmesh.git
commit e91ae105d44d750f5f0e7b595686cfc68ec8c5e4 Merge: 44a4416de 890d37853 Author: xwm1992 <[email protected]> AuthorDate: Mon Jul 1 12:11:00 2024 +0800 solve conflicts with master branch .github/dependabot.yml | 9 +- .github/workflows/auto-dependabot.yml | 2 +- .github/workflows/ci.yml | 10 +- .github/workflows/code-scanning.yml | 2 +- build.gradle | 63 +++--- eventmesh-admin-server/build.gradle | 48 ++--- .../org/apache/eventmesh/common/Constants.java | 2 + .../connector/http/SourceConnectorConfig.java | 28 ++- .../common/utils/ConfigurationContextUtil.java | 3 +- .../canal/template/AbstractSqlTemplate.java | 10 +- .../eventmesh-connector-chatgpt/build.gradle | 4 +- .../eventmesh-connector-dingtalk/build.gradle | 2 +- .../eventmesh-connector-file/build.gradle | 4 +- .../eventmesh-connector-http/build.gradle | 3 +- .../http/common/SynchronizedCircularFifoQueue.java | 148 ++++++++++++++ .../http/sink/handle/RetryHttpSinkHandler.java | 6 +- .../http/sink/handle/WebhookHttpSinkHandler.java | 82 ++------ .../http/source/connector/HttpSourceConnector.java | 94 ++++----- .../connector/http/source/data/CommonResponse.java | 74 +++++++ .../connector/http/source/data/WebhookRequest.java | 25 ++- .../connector/http/source/protocol/Protocol.java | 58 ++++++ .../http/source/protocol/ProtocolFactory.java | 80 ++++++++ .../http/source/protocol/WebhookConstants.java | 50 +++++ .../source/protocol/impl/CloudEventProtocol.java | 107 ++++++++++ .../http/source/protocol/impl/CommonProtocol.java | 111 ++++++++++ .../http/source/protocol/impl/GitHubProtocol.java | 227 +++++++++++++++++++++ .../src/main/resources/source-config.yml | 9 +- .../source/connector/HttpSourceConnectorTest.java | 104 ++++++---- .../src/test/resources/source-config.yml | 10 +- .../eventmesh-connector-jdbc/build.gradle | 6 +- .../eventmesh-connector-redis/build.gradle | 2 +- .../eventmesh-connector-slack/build.gradle | 2 +- eventmesh-meta/eventmesh-meta-raft/build.gradle | 15 +- .../offsetmgmt/admin/AdminOffsetService.java | 2 - .../config/samples/eventmesh_v1_runtime.yaml | 1 - .../eventmesh-protocol-cloudevents/build.gradle | 2 +- .../eventmesh-protocol-grpc/build.gradle | 6 +- .../eventmesh-protocol-http/build.gradle | 2 +- .../eventmesh-protocol-meshmessage/build.gradle | 2 +- eventmesh-runtime/conf/admin-server.jks | Bin 0 -> 2808 bytes eventmesh-runtime/conf/eventmesh.properties | 24 ++- .../admin/handler/v2/ConfigurationHandler.java | 3 +- .../eventmesh/runtime/boot/AbstractHTTPServer.java | 41 ++-- .../runtime/boot/AbstractRemotingServer.java | 51 ++--- .../runtime/boot/EventMeshAdminBootstrap.java | 22 +- .../runtime/boot/EventMeshAdminServer.java | 88 ++++++-- .../runtime/boot/EventMeshGrpcBootstrap.java | 11 +- .../runtime/boot/EventMeshHTTPServer.java | 66 +----- .../runtime/boot/EventMeshHttpBootstrap.java | 15 +- .../eventmesh/runtime/boot/EventMeshServer.java | 81 +++----- .../runtime/boot/EventMeshTcpBootstrap.java | 12 +- .../runtime/boot/HTTPThreadPoolGroup.java | 51 +---- .../eventmesh/runtime/boot/SSLContextFactory.java | 25 +-- .../configuration/EventMeshAdminConfiguration.java | 61 ++++++ .../configuration/EventMeshGrpcConfiguration.java | 3 - .../configuration/EventMeshHTTPConfiguration.java | 4 - .../configuration/EventMeshTCPConfiguration.java | 3 - .../http/processor/AdminMetricsProcessor.java | 6 +- .../runtime/boot/EventMeshServerTest.java | 1 - .../EventMeshGrpcConfigurationTest.java | 1 - .../EventMeshHTTPConfigurationTest.java | 1 - .../EventMeshTCPConfigurationTest.java | 1 - .../util/EventMeshCloudEventWriterTest.java | 92 +++++++++ .../src/test/resources/configuration.properties | 2 - eventmesh-sdks/eventmesh-sdk-java/build.gradle | 2 +- .../auth/token/impl/auth/AuthTokenUtils.java | 114 ++++------- .../eventmesh-storage-kafka/build.gradle | 2 +- .../eventmesh-storage-redis/build.gradle | 14 +- .../eventmesh-storage-redis/gradle.properties | 1 + .../storage/redis/client/RedissonClient.java | 13 +- .../storage/redis/config/RedisProperties.java | 11 +- .../src/main/resources/redis-client.properties | 6 +- .../storage/redis/AbstractRedisServer.java | 22 +- .../storage/redis/config/RedisPropertiesTest.java | 10 +- resources/eventmesh-architecture-5.png | Bin 217382 -> 169892 bytes settings.gradle | 4 +- 76 files changed, 1567 insertions(+), 712 deletions(-) diff --cc build.gradle index df86a4956,bbda2423f..321b7fb7e --- a/build.gradle +++ b/build.gradle @@@ -751,19 -744,15 +748,17 @@@ subprojects dependency "org.apache.curator:curator-test:${curatorVersion}" dependency "org.projectlombok:lombok:1.18.32" - dependency "com.github.seancfoley:ipaddress:5.3.3" dependency "javax.annotation:javax.annotation-api:1.3.2" - dependency "com.alibaba.fastjson2:fastjson2:2.0.48" + dependency "com.alibaba.fastjson2:fastjson2:2.0.51" - dependency "software.amazon.awssdk:s3:2.25.55" + dependency "software.amazon.awssdk:s3:2.26.3" dependency "com.github.rholder:guava-retrying:2.0.0" + dependency "org.mybatis.spring.boot:mybatis-spring-boot-starter:2.3.1" - dependency "com.alibaba:druid-spring-boot-starter:1.2.22" - dependency "org.springframework.boot:spring-boot-starter-jetty:2.7.10" - + dependency "com.alibaba:druid-spring-boot-starter:1.2.23" + dependency "org.springframework.boot:spring-boot-starter-jetty:2.7.18" + dependency "com.baomidou:mybatis-plus:3.5.6" - dependency "com.mysql:mysql-connector-j:8.0.33" + dependency "com.mysql:mysql-connector-j:8.4.0" } } - } + } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
