You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2015/10/03 13:44:18 UTC
[2/2] wicket git commit: Upgrade Spring to 4.2.x
Upgrade Spring to 4.2.x
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7d555473
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7d555473
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7d555473
Branch: refs/heads/master
Commit: 7d5554735f2621d8dfc985592583cb1ba7f16cb3
Parents: ca7b6d8
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sat Oct 3 13:43:20 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sat Oct 3 13:43:20 2015 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
.../spring/test/ApplicationContextMock.java | 19 +++++++++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/7d555473/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0b44641..e16788d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,7 +132,7 @@
<jetty9.version>9.0.7.v20131107</jetty9.version>
<joda-time.version>2.7</joda-time.version>
<junit.version>4.12</junit.version>
- <spring.version>4.1.7.RELEASE</spring.version>
+ <spring.version>4.2.1.RELEASE</spring.version>
<servlet-api.version>3.0.1</servlet-api.version>
<maven.javadoc.version>2.10.3</maven.javadoc.version>
<maven.surefire.version>2.18</maven.surefire.version>
http://git-wip-us.apache.org/repos/asf/wicket/blob/7d555473/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 290ed61..c115ac5 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
@@ -35,6 +35,7 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationEvent;
import org.springframework.context.MessageSourceResolvable;
import org.springframework.context.NoSuchMessageException;
+import org.springframework.core.ResolvableType;
import org.springframework.core.env.Environment;
import org.springframework.core.io.Resource;
@@ -235,6 +236,12 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
}
@Override
+ public void publishEvent(Object o)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
public boolean containsBeanDefinition(final String beanName)
{
return containsBean(beanName);
@@ -253,6 +260,12 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
}
@Override
+ public String[] getBeanNamesForType(ResolvableType resolvableType)
+ {
+ return new String[0];
+ }
+
+ @Override
@SuppressWarnings({ "unchecked" })
public String[] getBeanNamesForType(final Class type)
{
@@ -398,6 +411,12 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
}
@Override
+ public boolean isTypeMatch(String s, ResolvableType resolvableType) throws NoSuchBeanDefinitionException
+ {
+ return false;
+ }
+
+ @Override
@SuppressWarnings({ "unchecked" })
public boolean isTypeMatch(final String name, final Class targetType)
throws NoSuchBeanDefinitionException