Skip to content

Conversation

@xchoox
Copy link
Contributor

@xchoox xchoox commented Sep 23, 2025

Make sure that:

  • You have read the contribution guidelines.
  • You submit test cases (unit or integration tests) that back your changes.
  • Your local test passed ./mvnw clean install -Dmaven.javadoc.skip=true.

xchoox and others added 10 commits September 15, 2025 19:19
# Conflicts:
#	shenyu-common/src/main/java/org/apache/shenyu/common/constant/Constants.java
#	shenyu-register-center/shenyu-register-client/shenyu-register-client-api/src/main/java/org/apache/shenyu/register/client/api/ShenyuClientRegisterRepository.java
#	shenyu-register-center/shenyu-register-client/shenyu-register-client-http/src/main/java/org/apache/shenyu/register/client/http/HttpClientRegisterRepository.java
#	shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-beat/src/main/java/org/apache/shenyu/register/client/beat/HeartbeatListenerConfiguration.java
@Aias00
Copy link
Contributor

Aias00 commented Sep 24, 2025

@xchoox resolve confilicts

xchoox and others added 7 commits September 24, 2025 20:15
# Conflicts:
#	shenyu-spring-boot-starter/shenyu-spring-boot-starter-sync-data-center/shenyu-spring-boot-starter-sync-data-websocket/src/main/java/org/apache/shenyu/springboot/starter/sync/data/websocket/WebsocketSyncDataConfiguration.java
#	shenyu-sync-data-center/shenyu-sync-data-websocket/src/main/java/org/apache/shenyu/plugin/sync/data/websocket/WebsocketSyncDataService.java
#	shenyu-sync-data-center/shenyu-sync-data-websocket/src/main/java/org/apache/shenyu/plugin/sync/data/websocket/client/ShenyuWebsocketClient.java
# Conflicts:
#	shenyu-spring-boot-starter/shenyu-spring-boot-starter-client/shenyu-spring-boot-starter-client-beat/src/main/java/org/apache/shenyu/register/client/beat/HeartbeatListenerConfiguration.java
@moremind moremind added this to the 2.7.0.3 milestone Sep 30, 2025
@moremind moremind added admin about pom about pom change labels Sep 30, 2025
@moremind moremind merged commit fc8c796 into apache:master Sep 30, 2025
51 of 54 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

about pom about pom change admin

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants