switch to new apache libraries