Guice trunk now requires Java6