Repository: wicket Updated Branches: refs/heads/master 13137b9da -> 510c94109
Upgrade Spring to 4.1.0 Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2a837d32 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2a837d32 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2a837d32 Branch: refs/heads/master Commit: 2a837d32d554398a6f6951d70ec389946d496751 Parents: 13137b9 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Sep 9 12:38:51 2014 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Sep 9 12:38:51 2014 +0300 ---------------------------------------------------------------------- pom.xml | 2 +- .../wicket/spring/test/ApplicationContextMock.java | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/2a837d32/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8494f98..e742fe3 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ <jacoco.version>0.7.1.201405082137</jacoco.version> <jetty.version>8.1.15.v20140411</jetty.version> <jetty9.version>9.0.7.v20131107</jetty9.version> - <spring.version>4.0.7.RELEASE</spring.version> + <spring.version>4.1.0.RELEASE</spring.version> <servlet-api.version>3.0.1</servlet-api.version> <maven.javadoc.version>2.9.1</maven.javadoc.version> <maven.surefire.version>2.17</maven.surefire.version> http://git-wip-us.apache.org/repos/asf/wicket/blob/2a837d32/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java ---------------------------------------------------------------------- diff --git a/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java b/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java index b6f2ebd..4de9a4b 100644 --- a/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java +++ b/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java @@ -96,6 +96,12 @@ public class ApplicationContextMock implements ApplicationContext, Serializable return bean; } + @Override + public Object getBean(final String name, final Object... args) throws BeansException + { + return getBean(name); + } + /** * @see org.springframework.beans.factory.BeanFactory#getBean(java.lang.String, java.lang.Class) */ @@ -152,6 +158,12 @@ public class ApplicationContextMock implements ApplicationContext, Serializable } @Override + public <T> T getBean(Class<T> requiredType, Object... objects) throws BeansException + { + return getBean(requiredType); + } + + @Override public Map<String, Object> getBeansWithAnnotation(Class<? extends Annotation> annotationType) throws BeansException {
