Merge branch 'develop-tmp'

# Conflicts: # kafka-client/pom.xml # kafka/pom.xml
2026-11-04 00:30:15 +08:00 · 2018-08-23 23:59:20 +08:00
parent 899592ce2a 9e3d4a7ffe
commit 4fe6c36c49
36 changed files with 136 additions and 848 deletions
--- a/deployer/pom.xml
+++ b/deployer/pom.xml
@@ -40,6 +40,7 @@
 						<exclude>**/canal.properties</exclude>
 						<exclude>**/spring/**</exclude>
 						<exclude>**/example/**</exclude>
+						<exclude>**/kafka.yml</exclude>
 					</excludes>
 				</configuration>
 			</plugin>