json and xml test project commit

Signed-off-by: superwuxin <870757543@qq.com>
Merge branch 'master' of ssh://git@github.com/superwuxin/test-parent.git

Conflicts:
	pom.xml


Signed-off-by: superwuxin <870757543@qq.com>