diff --git a/spring-4/README.md b/spring-4/README.md
index 57cb8c3eeb..584b93a3a3 100644
--- a/spring-4/README.md
+++ b/spring-4/README.md
@@ -2,3 +2,4 @@
- [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)
- [Spring JSON-P with Jackson](http://www.baeldung.com/spring-jackson-jsonp)
+- [What’s New in Spring 4.3?](http://www.baeldung.com/whats-new-in-spring-4-3)
diff --git a/spring-4/pom.xml b/spring-4/pom.xml
index 59b74782ec..6c282b76a0 100644
--- a/spring-4/pom.xml
+++ b/spring-4/pom.xml
@@ -67,6 +67,27 @@
tomcat-embed-jasper
provided
+
+ org.apache.logging.log4j
+ log4j-api
+
+
+ org.apache.logging.log4j
+ log4j-core
+
+
+ org.easymock
+ easymock
+ ${easymock.version}
+ test
+
+
+
+ org.hsqldb
+ hsqldb
+ ${hsqldb.version}
+ test
+
@@ -88,6 +109,8 @@
com.baeldung.flips.ApplicationConfig
1.0.1
+ 3.6
+ 2.4.0
diff --git a/spring-all/src/main/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationsTestController.java b/spring-4/src/main/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationsTestController.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationsTestController.java
rename to spring-4/src/main/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationsTestController.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/attributeannotations/ParamInterceptor.java b/spring-4/src/main/java/org/baeldung/spring43/attributeannotations/ParamInterceptor.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/attributeannotations/ParamInterceptor.java
rename to spring-4/src/main/java/org/baeldung/spring43/attributeannotations/ParamInterceptor.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/cache/Foo.java b/spring-4/src/main/java/org/baeldung/spring43/cache/Foo.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/cache/Foo.java
rename to spring-4/src/main/java/org/baeldung/spring43/cache/Foo.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/cache/FooService.java b/spring-4/src/main/java/org/baeldung/spring43/cache/FooService.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/cache/FooService.java
rename to spring-4/src/main/java/org/baeldung/spring43/cache/FooService.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/composedmapping/Appointment.java b/spring-4/src/main/java/org/baeldung/spring43/composedmapping/Appointment.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/composedmapping/Appointment.java
rename to spring-4/src/main/java/org/baeldung/spring43/composedmapping/Appointment.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/composedmapping/AppointmentService.java b/spring-4/src/main/java/org/baeldung/spring43/composedmapping/AppointmentService.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/composedmapping/AppointmentService.java
rename to spring-4/src/main/java/org/baeldung/spring43/composedmapping/AppointmentService.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/composedmapping/AppointmentsController.java b/spring-4/src/main/java/org/baeldung/spring43/composedmapping/AppointmentsController.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/composedmapping/AppointmentsController.java
rename to spring-4/src/main/java/org/baeldung/spring43/composedmapping/AppointmentsController.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/ctor/FooRepository.java b/spring-4/src/main/java/org/baeldung/spring43/ctor/FooRepository.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/ctor/FooRepository.java
rename to spring-4/src/main/java/org/baeldung/spring43/ctor/FooRepository.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/ctor/FooService.java b/spring-4/src/main/java/org/baeldung/spring43/ctor/FooService.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/ctor/FooService.java
rename to spring-4/src/main/java/org/baeldung/spring43/ctor/FooService.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/defaultmethods/DateHolder.java b/spring-4/src/main/java/org/baeldung/spring43/defaultmethods/DateHolder.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/defaultmethods/DateHolder.java
rename to spring-4/src/main/java/org/baeldung/spring43/defaultmethods/DateHolder.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/defaultmethods/IDateHolder.java b/spring-4/src/main/java/org/baeldung/spring43/defaultmethods/IDateHolder.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/defaultmethods/IDateHolder.java
rename to spring-4/src/main/java/org/baeldung/spring43/defaultmethods/IDateHolder.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/depresolution/FooRepository.java b/spring-4/src/main/java/org/baeldung/spring43/depresolution/FooRepository.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/depresolution/FooRepository.java
rename to spring-4/src/main/java/org/baeldung/spring43/depresolution/FooRepository.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/depresolution/FooService.java b/spring-4/src/main/java/org/baeldung/spring43/depresolution/FooService.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/depresolution/FooService.java
rename to spring-4/src/main/java/org/baeldung/spring43/depresolution/FooService.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/scopeannotations/AppPreferences.java b/spring-4/src/main/java/org/baeldung/spring43/scopeannotations/AppPreferences.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/scopeannotations/AppPreferences.java
rename to spring-4/src/main/java/org/baeldung/spring43/scopeannotations/AppPreferences.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/scopeannotations/InstanceCountingService.java b/spring-4/src/main/java/org/baeldung/spring43/scopeannotations/InstanceCountingService.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/scopeannotations/InstanceCountingService.java
rename to spring-4/src/main/java/org/baeldung/spring43/scopeannotations/InstanceCountingService.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/scopeannotations/LoginAction.java b/spring-4/src/main/java/org/baeldung/spring43/scopeannotations/LoginAction.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/scopeannotations/LoginAction.java
rename to spring-4/src/main/java/org/baeldung/spring43/scopeannotations/LoginAction.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/scopeannotations/ScopeTestController.java b/spring-4/src/main/java/org/baeldung/spring43/scopeannotations/ScopeTestController.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/scopeannotations/ScopeTestController.java
rename to spring-4/src/main/java/org/baeldung/spring43/scopeannotations/ScopeTestController.java
diff --git a/spring-all/src/main/java/org/baeldung/spring43/scopeannotations/UserPreferences.java b/spring-4/src/main/java/org/baeldung/spring43/scopeannotations/UserPreferences.java
similarity index 100%
rename from spring-all/src/main/java/org/baeldung/spring43/scopeannotations/UserPreferences.java
rename to spring-4/src/main/java/org/baeldung/spring43/scopeannotations/UserPreferences.java
diff --git a/spring-all/src/main/resources/defaultmethods-context.xml b/spring-4/src/main/resources/defaultmethods-context.xml
similarity index 100%
rename from spring-all/src/main/resources/defaultmethods-context.xml
rename to spring-4/src/main/resources/defaultmethods-context.xml
diff --git a/spring-all/src/main/resources/implicit-ctor-context.xml b/spring-4/src/main/resources/implicit-ctor-context.xml
similarity index 100%
rename from spring-all/src/main/resources/implicit-ctor-context.xml
rename to spring-4/src/main/resources/implicit-ctor-context.xml
diff --git a/spring-all/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationConfiguration.java b/spring-4/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationConfiguration.java
similarity index 91%
rename from spring-all/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationConfiguration.java
rename to spring-4/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationConfiguration.java
index 347dd399e2..97ae651473 100644
--- a/spring-all/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationConfiguration.java
+++ b/spring-4/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationConfiguration.java
@@ -6,13 +6,13 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.ViewResolver;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
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;
@Configuration
@ComponentScan
@EnableWebMvc
-public class AttributeAnnotationConfiguration implements WebMvcConfigurer {
+public class AttributeAnnotationConfiguration extends WebMvcConfigurerAdapter {
@Bean
public ViewResolver viewResolver() {
diff --git a/spring-all/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationIntegrationTest.java b/spring-4/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationIntegrationTest.java
rename to spring-4/src/test/java/org/baeldung/spring43/attributeannotations/AttributeAnnotationIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/spring43/cache/CacheRefinementsConfiguration.java b/spring-4/src/test/java/org/baeldung/spring43/cache/CacheRefinementsConfiguration.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/spring43/cache/CacheRefinementsConfiguration.java
rename to spring-4/src/test/java/org/baeldung/spring43/cache/CacheRefinementsConfiguration.java
diff --git a/spring-all/src/test/java/org/baeldung/spring43/cache/CacheRefinementsIntegrationTest.java b/spring-4/src/test/java/org/baeldung/spring43/cache/CacheRefinementsIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/spring43/cache/CacheRefinementsIntegrationTest.java
rename to spring-4/src/test/java/org/baeldung/spring43/cache/CacheRefinementsIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java b/spring-4/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java
similarity index 97%
rename from spring-all/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java
rename to spring-4/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java
index eddd56a11b..f1028ebefb 100644
--- a/spring-all/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java
+++ b/spring-4/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingConfiguration.java
@@ -14,7 +14,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.context.annotation.Scope;
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.replay;
@Configuration
@ComponentScan
diff --git a/spring-all/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingIntegrationTest.java b/spring-4/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingIntegrationTest.java
rename to spring-4/src/test/java/org/baeldung/spring43/composedmapping/ComposedMappingIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/spring43/ctor/ConfigurationConstructorInjectionIntegrationTest.java b/spring-4/src/test/java/org/baeldung/spring43/ctor/ConfigurationConstructorInjectionIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/spring43/ctor/ConfigurationConstructorInjectionIntegrationTest.java
rename to spring-4/src/test/java/org/baeldung/spring43/ctor/ConfigurationConstructorInjectionIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/spring43/ctor/FooRepositoryConfiguration.java b/spring-4/src/test/java/org/baeldung/spring43/ctor/FooRepositoryConfiguration.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/spring43/ctor/FooRepositoryConfiguration.java
rename to spring-4/src/test/java/org/baeldung/spring43/ctor/FooRepositoryConfiguration.java
diff --git a/spring-all/src/test/java/org/baeldung/spring43/ctor/FooServiceConfiguration.java b/spring-4/src/test/java/org/baeldung/spring43/ctor/FooServiceConfiguration.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/spring43/ctor/FooServiceConfiguration.java
rename to spring-4/src/test/java/org/baeldung/spring43/ctor/FooServiceConfiguration.java
diff --git a/spring-all/src/test/java/org/baeldung/spring43/ctor/ImplicitConstructorIntegrationTest.java b/spring-4/src/test/java/org/baeldung/spring43/ctor/ImplicitConstructorIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/spring43/ctor/ImplicitConstructorIntegrationTest.java
rename to spring-4/src/test/java/org/baeldung/spring43/ctor/ImplicitConstructorIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/spring43/defaultmethods/DefaultMethodsInjectionIntegrationTest.java b/spring-4/src/test/java/org/baeldung/spring43/defaultmethods/DefaultMethodsInjectionIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/spring43/defaultmethods/DefaultMethodsInjectionIntegrationTest.java
rename to spring-4/src/test/java/org/baeldung/spring43/defaultmethods/DefaultMethodsInjectionIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/spring43/defaultmethods/ITransactionalUnitTest.java b/spring-4/src/test/java/org/baeldung/spring43/defaultmethods/ITransactionalUnitTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/spring43/defaultmethods/ITransactionalUnitTest.java
rename to spring-4/src/test/java/org/baeldung/spring43/defaultmethods/ITransactionalUnitTest.java
diff --git a/spring-all/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalIntegrationTest.java b/spring-4/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalIntegrationTest.java
rename to spring-4/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalTestConfiguration.java b/spring-4/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalTestConfiguration.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalTestConfiguration.java
rename to spring-4/src/test/java/org/baeldung/spring43/defaultmethods/TransactionalTestConfiguration.java
diff --git a/spring-all/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderConfiguration.java b/spring-4/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderConfiguration.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderConfiguration.java
rename to spring-4/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderConfiguration.java
diff --git a/spring-all/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderIntegrationTest.java b/spring-4/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderIntegrationTest.java
rename to spring-4/src/test/java/org/baeldung/spring43/depresolution/ObjectProviderIntegrationTest.java
diff --git a/spring-all/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsConfiguration.java b/spring-4/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsConfiguration.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsConfiguration.java
rename to spring-4/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsConfiguration.java
diff --git a/spring-all/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsIntegrationTest.java b/spring-4/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsIntegrationTest.java
similarity index 100%
rename from spring-all/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsIntegrationTest.java
rename to spring-4/src/test/java/org/baeldung/spring43/scopeannotations/ScopeAnnotationsIntegrationTest.java
diff --git a/spring-all/README.md b/spring-all/README.md
index 16da3bc8a1..3ee610f370 100644
--- a/spring-all/README.md
+++ b/spring-all/README.md
@@ -13,7 +13,6 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring
- [Guide to Spring @Autowired](http://www.baeldung.com/spring-autowire)
- [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)
-- [What’s 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)
- [Quick Guide to Spring Bean Scopes](http://www.baeldung.com/spring-bean-scopes)
- [Custom Scope in Spring](http://www.baeldung.com/spring-custom-scope)
diff --git a/spring-all/pom.xml b/spring-all/pom.xml
index 1b733555da..bb6169085e 100644
--- a/spring-all/pom.xml
+++ b/spring-all/pom.xml
@@ -141,20 +141,6 @@
mockito-core
test
-
- org.easymock
- easymock
- ${easymock.version}
- test
-
-
- org.apache.logging.log4j
- log4j-api
-
-
- org.apache.logging.log4j
- log4j-core
-