Squash commit for enabling publishing of java and scala sources in one jar.