8 Commits (f21e7940ba9d86cfdd6acd8a3d40d5f5e24806a2)

Author	SHA1	Message	Date
Spring Buildmaster	7e9ed5e1a7	Next Development Version	8 years ago
Spring Buildmaster	334baaeffd	Next development version	8 years ago
Phillip Webb	89b7704977	Extract spring-boot-test.jar ... Relocate the `org.springframework.boot.test` package from the `spring-boot.jar` to `spring-boot-test.jar`. Fixes gh-5184	9 years ago
Phillip Webb	fbaf209240	Move master to 1.4.0.BUILD-SNAPSHOT	9 years ago
Spring Buildmaster	504d3e97ba	Next development version	9 years ago
Spring Buildmaster	8db59059a5	Next Development Version	9 years ago
Spring Buildmaster	3f6f57a80e	Next Development Version	9 years ago
Andy Wilkinson	c4122b8f8d	Work around brittle annotation scanning in Mojarra ... FacesListener in Mojarra 2.2.12 (used in Glassfish 4.1.1) is a ServletContainerInitializer that’s annotated to handle types annotated with javax.annotation.Resource. OAuth2RestOperationsConfiguration.SessionScopedConfiguration is one such class. This leads to com.sun.faces.config.DelegatingAnnotationProvider calling getAnnotations on SessionScopedConfiguration.class. This fails with a java.lang.ArrayStoreException due to SessionScopedConfiguration being annotated with @ConditionalOnBean(OAuth2ClientConfiguration) and OAuth2ClientConfiguration not being on the classpath. DelegatingAnnotationProvider currently catches NoClassDefFoundErrors thrown during its annotation processing. It needs to be made more robust so that it also copes with an ArrayStoreException, in a similar way to how org.glassfish.apf.impl.AnnotationProcessorImpl was updated to fix GLASSFISH-21265 [1]. I’ve opened an issue to this effect [2]. In the meantime, we can work around the brittleness in DelegatingAnnotationProvider by restructuring SessionScopedConfiguration. This commit moves the use of @Resource into a nested inner class, ClientContextConfiguration, while leaving the use of @ConditionalOnBean on SessionScopedConfiguration. This means that it is now ClientContextConfiguration that is passed to FacesListener and processed by DelegatingAnnotationProcessor, thereby avoiding exposing it to the @ConditionalOnBean annotation that it does not handle gracefully. A Glassfish-based deployment test has also been added to verify the fix. Closes gh-2079 Closes gh-4321 [1] https://java.net/jira/browse/GLASSFISH-21265 [2] https://java.net/jira/browse/JAVASERVERFACES-4076	9 years ago