Updated Branches: refs/heads/master bdc882865 -> e41a6523c
Upgrade Spring to 4.0.0 Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a7d24225 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a7d24225 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a7d24225 Branch: refs/heads/master Commit: a7d24225d721f2b1915f7c0d13d5826cd96adab1 Parents: bdc8828 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu Dec 12 16:19:29 2013 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu Dec 12 16:19:29 2013 +0200 ---------------------------------------------------------------------- pom.xml | 2 +- .../org/apache/wicket/spring/test/ApplicationContextMock.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/a7d24225/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b00878e..0cb3936 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <jacoco.version>0.6.3.201306030806</jacoco.version> <jetty.version>8.1.13.v20130916</jetty.version> <jetty9.version>9.0.6.v20130930</jetty9.version> - <spring.version>3.2.4.RELEASE</spring.version> + <spring.version>4.0.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.12.2</maven.surefire.version> http://git-wip-us.apache.org/repos/asf/wicket/blob/a7d24225/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 a38c18b..27a27a3 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 @@ -309,6 +309,12 @@ public class ApplicationContextMock implements ApplicationContext, Serializable throw new UnsupportedOperationException(); } + @Override + public String[] getBeanNamesForAnnotation(Class<? extends Annotation> aClass) + { + throw new UnsupportedOperationException(); + } + /** * @see org.springframework.beans.factory.BeanFactory#containsBean(java.lang.String) */
