move spring-all/spring43 to spring-4 module

* WebMvcConfigurer default methods are available only in Spring 5+
  changed AttributeAnnotationConfiguration to
  extend WebMvcConfigurerAdapter
This commit is contained in:
Denis 2019-10-06 11:26:14 +02:00 committed by Denis
parent f8ca31c99b
commit 6f6f891355
42 changed files with 27 additions and 18 deletions

View File

@ -2,3 +2,4 @@
- [A Guide to Flips for Spring](http://www.baeldung.com/flips-spring) - [A Guide to Flips for Spring](http://www.baeldung.com/flips-spring)
- [Configuring a Hikari Connection Pool with Spring Boot](https://www.baeldung.com/spring-boot-hikari) - [Configuring a Hikari Connection Pool with Spring Boot](https://www.baeldung.com/spring-boot-hikari)
- [Spring JSON-P with Jackson](http://www.baeldung.com/spring-jackson-jsonp) - [Spring JSON-P with Jackson](http://www.baeldung.com/spring-jackson-jsonp)
- [Whats New in Spring 4.3?](http://www.baeldung.com/whats-new-in-spring-4-3)

View File

@ -67,6 +67,27 @@
<artifactId>tomcat-embed-jasper</artifactId> <artifactId>tomcat-embed-jasper</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>${easymock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>${hsqldb.version}</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
@ -88,6 +109,8 @@
<properties> <properties>
<start-class>com.baeldung.flips.ApplicationConfig</start-class> <start-class>com.baeldung.flips.ApplicationConfig</start-class>
<flips-web.version>1.0.1</flips-web.version> <flips-web.version>1.0.1</flips-web.version>
<easymock.version>3.6</easymock.version>
<hsqldb.version>2.4.0</hsqldb.version>
</properties> </properties>
</project> </project>

View File

@ -6,13 +6,13 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.ViewResolver; import org.springframework.web.servlet.ViewResolver;
import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import org.springframework.web.servlet.view.InternalResourceViewResolver; import org.springframework.web.servlet.view.InternalResourceViewResolver;
@Configuration @Configuration
@ComponentScan @ComponentScan
@EnableWebMvc @EnableWebMvc
public class AttributeAnnotationConfiguration implements WebMvcConfigurer { public class AttributeAnnotationConfiguration extends WebMvcConfigurerAdapter {
@Bean @Bean
public ViewResolver viewResolver() { public ViewResolver viewResolver() {

View File

@ -14,7 +14,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import static org.easymock.EasyMock.*; import static org.easymock.EasyMock.replay;
@Configuration @Configuration
@ComponentScan @ComponentScan

View File

@ -13,7 +13,6 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
- [Guide to Spring @Autowired](http://www.baeldung.com/spring-autowire) - [Guide to Spring @Autowired](http://www.baeldung.com/spring-autowire)
- [Spring Profiles](http://www.baeldung.com/spring-profiles) - [Spring Profiles](http://www.baeldung.com/spring-profiles)
- [A Spring Custom Annotation for a Better DAO](http://www.baeldung.com/spring-annotation-bean-pre-processor) - [A Spring Custom Annotation for a Better DAO](http://www.baeldung.com/spring-annotation-bean-pre-processor)
- [Whats New in Spring 4.3?](http://www.baeldung.com/whats-new-in-spring-4-3)
- [Running Setup Data on Startup in Spring](http://www.baeldung.com/running-setup-logic-on-startup-in-spring) - [Running Setup Data on Startup in Spring](http://www.baeldung.com/running-setup-logic-on-startup-in-spring)
- [Quick Guide to Spring Bean Scopes](http://www.baeldung.com/spring-bean-scopes) - [Quick Guide to Spring Bean Scopes](http://www.baeldung.com/spring-bean-scopes)
- [Custom Scope in Spring](http://www.baeldung.com/spring-custom-scope) - [Custom Scope in Spring](http://www.baeldung.com/spring-custom-scope)

View File

@ -141,20 +141,6 @@
<artifactId>mockito-core</artifactId> <artifactId>mockito-core</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>${easymock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
<!-- ShedLock --> <!-- ShedLock -->
<dependency> <dependency>