diff --git a/org.springframework.core/template.mf b/org.springframework.core/template.mf index 77939e1157..15e414bb8c 100644 --- a/org.springframework.core/template.mf +++ b/org.springframework.core/template.mf @@ -8,7 +8,7 @@ Import-Template: edu.emory.mathcs.backport.*;version="[3.0.0, 4.0.0)";resolution:=optional, org.apache.commons.collections.*;version="[3.2.0, 4.0.0)";resolution:=optional, org.apache.commons.logging.*;version="[1.1.1, 2.0.0)", - org.springframework.asm.*;version="[2.5.6, 3.0.0]";resolution:=optional, + org.springframework.asm.*;version="[3.0.0, 3.0.1)";resolution:=optional, org.apache.log4j.*;version="[1.2.15, 2.0.0)";resolution:=optional, org.aspectj.*;version="[1.5.4, 2.0.0)";resolution:=optional Unversioned-Imports: diff --git a/org.springframework.web/src/main/java/org/springframework/web/context/support/WebApplicationContextUtils.java b/org.springframework.web/src/main/java/org/springframework/web/context/support/WebApplicationContextUtils.java index 282dea7a2b..15a828148d 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/context/support/WebApplicationContextUtils.java +++ b/org.springframework.web/src/main/java/org/springframework/web/context/support/WebApplicationContextUtils.java @@ -119,7 +119,7 @@ public abstract class WebApplicationContextUtils { * as used by the WebApplicationContext. * @param beanFactory the BeanFactory to configure */ - static void registerWebApplicationScopes(ConfigurableListableBeanFactory beanFactory) { + public static void registerWebApplicationScopes(ConfigurableListableBeanFactory beanFactory) { beanFactory.registerScope(WebApplicationContext.SCOPE_REQUEST, new RequestScope()); beanFactory.registerScope(WebApplicationContext.SCOPE_SESSION, new SessionScope(false)); beanFactory.registerScope(WebApplicationContext.SCOPE_GLOBAL_SESSION, new SessionScope(true));