Clean up Spring 4/5

Author: drandarov-io

03_spring/03_03_spring_4/build.gradle

@@ -23,7 +23,7 @@ dependencies {
 
 
     // Commons
-//    compile project(":common")
+    compile project(":common")
 
 
     // Database Drivers

03_spring/03_03_spring_4/src/test/java/com/dmitrijdrandarov/Spring4Config.java

@@ -1,7 +1,6 @@
 package com.dmitrijdrandarov;
 
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase;
@@ -18,17 +17,14 @@
 
 
 @Configuration
-//@ComponentScan(basePackages = {"com.dmitrijdrandarov.repositories"})
 @EnableJpaRepositories(basePackages={"com.dmitrijdrandarov.repositories"})
 public class Spring4Config {
 
     @Bean
     public DataSource dataSource() {
-
-        // no need shutdown, EmbeddedDatabaseFactoryBean will take care of this
         EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder();
         EmbeddedDatabase db = builder
-                .setType(EmbeddedDatabaseType.HSQL) //.H2 or .DERBY
+                .setType(EmbeddedDatabaseType.HSQL)
                 .addScript("schema.sql")
                 .addScript("data.sql")
                 .build();

03_spring/03_03_spring_4/src/test/java/com/dmitrijdrandarov/entities/DummyFruit.java

@@ -14,17 +14,15 @@ dependencies {
 
     // Spring 5
     compile "org.springframework.data:spring-data-jpa:2.0.0.${spring5RC}"
-    compile "org.springframework:spring-test:5.0.0.${spring5RC}"
-    // JUnit 5 Extension for Spring 4 Tests
-//    testCompile "com.github.sbrannen:spring-test-junit5:1.0.0.${spring5RC}"
+    testCompile "org.springframework:spring-test:5.0.0.${spring5RC}"
 
 
     // Hibernate JPA
     compile "org.hibernate:hibernate-core:5.2.10.Final"
 
 
     // Commons
-//    compile project(":common")
+    compile project(":common")
 
 
     // Database Drivers

03_spring/03_03_spring_4/src/test/java/com/dmitrijdrandarov/entities/DummyObject.java

@@ -17,7 +17,6 @@
 
 
 @Configuration
-//@ComponentScan(basePackages = {"com.dmitrijdrandarov.repositories"})
 @EnableJpaRepositories(basePackages={"com.dmitrijdrandarov.repositories"})
 public class Spring5Config {