I'm not certain MavenRepositoryRemoteImpl can go into api-maven; it has references out into Aether and would then lead to a dependency leak, no?