upgrade ES Version and activemq version, and big refactoring in the river