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 2018/09/26 11:49:19 UTC
wicket git commit: Upgrade Spring to 5.1.0
Repository: wicket
Updated Branches:
refs/heads/master 722358d6d -> 4432867f8
Upgrade Spring to 5.1.0
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/4432867f
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4432867f
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4432867f
Branch: refs/heads/master
Commit: 4432867f81b5ab65f9908a0303f64e937147b20e
Parents: 722358d
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Sep 26 14:48:57 2018 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Sep 26 14:48:57 2018 +0300
----------------------------------------------------------------------
pom.xml | 2 +-
.../wicket/spring/test/ApplicationContextMock.java | 13 +++++++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/4432867f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 080b97f..9acff78 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@
<jacoco.version>0.8.2</jacoco.version>
<jetty.version>9.4.12.v20180830</jetty.version>
<junit.version>4.12</junit.version>
- <spring.version>5.0.8.RELEASE</spring.version>
+ <spring.version>5.1.0.RELEASE</spring.version>
<servlet-api.version>3.1.0</servlet-api.version>
<maven.javadoc.version>3.0.1</maven.javadoc.version>
<maven.surefire.version>2.20</maven.surefire.version>
http://git-wip-us.apache.org/repos/asf/wicket/blob/4432867f/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 4365abb..f38f91a 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
@@ -30,6 +30,7 @@ import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanNotOfRequiredTypeException;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.beans.factory.ObjectProvider;
import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationEvent;
@@ -162,6 +163,18 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
}
@Override
+ public <T> ObjectProvider<T> getBeanProvider(Class<T> aClass)
+ {
+ return null;
+ }
+
+ @Override
+ public <T> ObjectProvider<T> getBeanProvider(ResolvableType resolvableType)
+ {
+ return null;
+ }
+
+ @Override
public Map<String, Object> getBeansWithAnnotation(Class<? extends Annotation> annotationType)
throws BeansException
{