Make Shrinkwrap resolver work in a modular environment

The subsystem I'm building requires dependencies of my war to downloaded and resolved at runtime or deploy time.

So, that means that I need to create a set of JBoss AS7 modules for Shrinkwrap resolver. However, the way classloader works to load META-INF/services/org.jboss.shrinkwrap.resolver.api.maven.MavenDependencyResolver is a bit crap cos it uses thread context classloader in DependencyBuilderInstantiator.

Can this be rewritten so that classloading can work in a modular environment as well?

The problem is that the thread context classloader at runtime is:

ModuleClassLoader for Module "org.jboss.as.server:main" from local module loader @5d2412e7 (roots: ...)

I can probably workaround this setting the module's classloader as thread context classloader temporarily, but this is not nice.

Thoughts?