diff --git a/pom.xml b/pom.xml index b642cfbeb1..982c52c54e 100644 --- a/pom.xml +++ b/pom.xml @@ -1312,7 +1312,6 @@ spring-boot-ops-2 spring-boot-rest spring-boot-data - spring-data-disable-auto-configuration spring-boot-parent spring-boot-property-exp spring-boot-security diff --git a/spring-boot-data/pom.xml b/spring-boot-data/pom.xml index 8735a54e7b..9c11e09f4a 100644 --- a/spring-boot-data/pom.xml +++ b/spring-boot-data/pom.xml @@ -15,6 +15,30 @@ + + org.springframework.boot + spring-boot-starter-data-redis + 2.1.6.RELEASE + + + + org.springframework.boot + spring-boot-starter-data-mongodb + 2.1.6.RELEASE + + + + org.springframework.boot + spring-boot-starter-data-jpa + 2.1.6.RELEASE + + + + com.h2database + h2 + 1.4.197 + + org.springframework.boot spring-boot-starter-web diff --git a/spring-data-disable-auto-configuration/spring-data-jpa/src/main/java/com/baeldung/jpa/SpringDataJPA.java b/spring-boot-data/src/main/java/com/baeldung/disableautoconfig/SpringDataJPA.java similarity index 94% rename from spring-data-disable-auto-configuration/spring-data-jpa/src/main/java/com/baeldung/jpa/SpringDataJPA.java rename to spring-boot-data/src/main/java/com/baeldung/disableautoconfig/SpringDataJPA.java index 211b5dc8b4..8e4ee76a25 100644 --- a/spring-data-disable-auto-configuration/spring-data-jpa/src/main/java/com/baeldung/jpa/SpringDataJPA.java +++ b/spring-boot-data/src/main/java/com/baeldung/disableautoconfig/SpringDataJPA.java @@ -1,4 +1,4 @@ -package com.baeldung.jpa; +package com.baeldung.disableautoconfig; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/spring-data-disable-auto-configuration/spring-data-mongodb/src/main/java/com/baeldung/mongodb/SpringDataMongoDB.java b/spring-boot-data/src/main/java/com/baeldung/disableautoconfig/SpringDataMongoDB.java similarity index 82% rename from spring-data-disable-auto-configuration/spring-data-mongodb/src/main/java/com/baeldung/mongodb/SpringDataMongoDB.java rename to spring-boot-data/src/main/java/com/baeldung/disableautoconfig/SpringDataMongoDB.java index a38eddb0e8..5e1cafa932 100644 --- a/spring-data-disable-auto-configuration/spring-data-mongodb/src/main/java/com/baeldung/mongodb/SpringDataMongoDB.java +++ b/spring-boot-data/src/main/java/com/baeldung/disableautoconfig/SpringDataMongoDB.java @@ -1,4 +1,4 @@ -package com.baeldung.mongodb; +package com.baeldung.disableautoconfig; import org.springframework.boot.SpringApplication; @@ -10,6 +10,6 @@ import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration; public class SpringDataMongoDB { public static void main(String[] args) { - SpringApplication.run(SpringMongoDB.class, args); + SpringApplication.run(SpringDataMongoDB.class, args); } } diff --git a/spring-data-disable-auto-configuration/spring-data-redis/src/main/java/com/baeldung/redis/SpringDataRedis.java b/spring-boot-data/src/main/java/com/baeldung/disableautoconfig/SpringDataRedis.java similarity index 82% rename from spring-data-disable-auto-configuration/spring-data-redis/src/main/java/com/baeldung/redis/SpringDataRedis.java rename to spring-boot-data/src/main/java/com/baeldung/disableautoconfig/SpringDataRedis.java index d5a682834b..9ec831c446 100644 --- a/spring-data-disable-auto-configuration/spring-data-redis/src/main/java/com/baeldung/redis/SpringDataRedis.java +++ b/spring-boot-data/src/main/java/com/baeldung/disableautoconfig/SpringDataRedis.java @@ -1,4 +1,4 @@ -package com.baeldung.redis; +package com.baeldung.disableautoconfig; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -9,6 +9,6 @@ import org.springframework.boot.autoconfigure.data.redis.RedisRepositoriesAutoCo public class SpringDataRedis { public static void main(String[] args) { - SpringApplication.run(SpringRedis.class, args); + SpringApplication.run(SpringDataRedis.class, args); } } diff --git a/spring-data-disable-auto-configuration/spring-data-jpa/src/test/java/com/baeldung/jpa/SpringDataJPAIntegrationTest.java b/spring-boot-data/src/test/java/com/baeldung/disableautoconfig/SpringDataJPAIntegrationTest.java similarity index 95% rename from spring-data-disable-auto-configuration/spring-data-jpa/src/test/java/com/baeldung/jpa/SpringDataJPAIntegrationTest.java rename to spring-boot-data/src/test/java/com/baeldung/disableautoconfig/SpringDataJPAIntegrationTest.java index 170f60f861..a465979b3c 100644 --- a/spring-data-disable-auto-configuration/spring-data-jpa/src/test/java/com/baeldung/jpa/SpringDataJPAIntegrationTest.java +++ b/spring-boot-data/src/test/java/com/baeldung/disableautoconfig/SpringDataJPAIntegrationTest.java @@ -1,4 +1,4 @@ -package com.baeldung.jpa; +package com.baeldung.disableautoconfig; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/spring-data-disable-auto-configuration/spring-data-mongodb/src/test/java/com/baeldung/mongodb/SpringDataMongoDBIntegrationTest.java b/spring-boot-data/src/test/java/com/baeldung/disableautoconfig/SpringDataMongoDBIntegrationTest.java similarity index 89% rename from spring-data-disable-auto-configuration/spring-data-mongodb/src/test/java/com/baeldung/mongodb/SpringDataMongoDBIntegrationTest.java rename to spring-boot-data/src/test/java/com/baeldung/disableautoconfig/SpringDataMongoDBIntegrationTest.java index 33f5620c32..bdfadf76ce 100644 --- a/spring-data-disable-auto-configuration/spring-data-mongodb/src/test/java/com/baeldung/mongodb/SpringDataMongoDBIntegrationTest.java +++ b/spring-boot-data/src/test/java/com/baeldung/disableautoconfig/SpringDataMongoDBIntegrationTest.java @@ -1,4 +1,4 @@ -package com.baeldung.mongodb; +package com.baeldung.disableautoconfig; import org.junit.Test; import org.junit.runner.RunWith; @@ -11,7 +11,7 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) -@SpringBootTest(classes = SpringMongoDB.class) +@SpringBootTest(classes = SpringDataMongoDB.class) public class SpringDataMongoDBIntegrationTest { @Autowired diff --git a/spring-data-disable-auto-configuration/spring-data-redis/src/test/java/com/baeldung/redis/SpringDataRedisIntegrationTest.java b/spring-boot-data/src/test/java/com/baeldung/disableautoconfig/SpringDataRedisIntegrationTest.java similarity index 89% rename from spring-data-disable-auto-configuration/spring-data-redis/src/test/java/com/baeldung/redis/SpringDataRedisIntegrationTest.java rename to spring-boot-data/src/test/java/com/baeldung/disableautoconfig/SpringDataRedisIntegrationTest.java index e142713417..10133cace3 100644 --- a/spring-data-disable-auto-configuration/spring-data-redis/src/test/java/com/baeldung/redis/SpringDataRedisIntegrationTest.java +++ b/spring-boot-data/src/test/java/com/baeldung/disableautoconfig/SpringDataRedisIntegrationTest.java @@ -1,4 +1,4 @@ -package com.baeldung.redis; +package com.baeldung.disableautoconfig; import org.junit.Test; import org.junit.runner.RunWith; @@ -11,7 +11,7 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) -@SpringBootTest(classes = SpringRedis.class) +@SpringBootTest(classes = SpringDataRedis.class) public class SpringDataRedisIntegrationTest { @Autowired diff --git a/spring-data-disable-auto-configuration/pom.xml b/spring-data-disable-auto-configuration/pom.xml deleted file mode 100644 index 91086262cf..0000000000 --- a/spring-data-disable-auto-configuration/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - 4.0.0 - com.baeldung - spring-data-disable-auto-configuration - 1.0.0-SNAPSHOT - spring-data-disable-auto-configuration - spring-data-disable-auto-configuration - pom - - - com.baeldung - parent-modules - 1.0.0-SNAPSHOT - .. - - - - spring-data-jpa - spring-data-mongodb - spring-data-redis - - - diff --git a/spring-data-disable-auto-configuration/spring-data-jpa/README.md b/spring-data-disable-auto-configuration/spring-data-jpa/README.md deleted file mode 100644 index 23117c9903..0000000000 --- a/spring-data-disable-auto-configuration/spring-data-jpa/README.md +++ /dev/null @@ -1,3 +0,0 @@ -This module is for Jira BAEL-2578 - -### Relevant Articles: diff --git a/spring-data-disable-auto-configuration/spring-data-jpa/pom.xml b/spring-data-disable-auto-configuration/spring-data-jpa/pom.xml deleted file mode 100644 index 35113c379a..0000000000 --- a/spring-data-disable-auto-configuration/spring-data-jpa/pom.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - 4.0.0 - com.baeldung - spring-data-jpa - 0.0.1-SNAPSHOT - spring-data-jpa - jar - Spring Data with JPA - - - spring-data-disable-auto-configuration - com.baeldung - 1.0.0-SNAPSHOT - - - - - org.springframework.boot - spring-boot-starter-data-jpa - 2.1.6.RELEASE - - - - com.h2database - h2 - 1.4.197 - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - \ No newline at end of file diff --git a/spring-data-disable-auto-configuration/spring-data-jpa/src/main/resources/application.properties b/spring-data-disable-auto-configuration/spring-data-jpa/src/main/resources/application.properties deleted file mode 100644 index fc33388896..0000000000 --- a/spring-data-disable-auto-configuration/spring-data-jpa/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration \ No newline at end of file diff --git a/spring-data-disable-auto-configuration/spring-data-jpa/src/main/resources/logback.xml b/spring-data-disable-auto-configuration/spring-data-jpa/src/main/resources/logback.xml deleted file mode 100644 index 7d900d8ea8..0000000000 --- a/spring-data-disable-auto-configuration/spring-data-jpa/src/main/resources/logback.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - \ No newline at end of file diff --git a/spring-data-disable-auto-configuration/spring-data-mongodb/README.md b/spring-data-disable-auto-configuration/spring-data-mongodb/README.md deleted file mode 100644 index b91f5eda5a..0000000000 --- a/spring-data-disable-auto-configuration/spring-data-mongodb/README.md +++ /dev/null @@ -1,4 +0,0 @@ -This module is for Jira BAEL-2578 - - -### Relevant Articles: diff --git a/spring-data-disable-auto-configuration/spring-data-mongodb/pom.xml b/spring-data-disable-auto-configuration/spring-data-mongodb/pom.xml deleted file mode 100644 index ad707632c5..0000000000 --- a/spring-data-disable-auto-configuration/spring-data-mongodb/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - 4.0.0 - com.baeldung - spring-data-mongodb - 0.0.1-SNAPSHOT - spring-data-mongodb - jar - Spring Data with MongoDB - - - spring-data-disable-auto-configuration - com.baeldung - 1.0.0-SNAPSHOT - - - - - org.springframework.boot - spring-boot-starter-data-mongodb - 2.1.6.RELEASE - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - \ No newline at end of file diff --git a/spring-data-disable-auto-configuration/spring-data-mongodb/src/main/resources/application.properties b/spring-data-disable-auto-configuration/spring-data-mongodb/src/main/resources/application.properties deleted file mode 100644 index 9f190ed8ae..0000000000 --- a/spring-data-disable-auto-configuration/spring-data-mongodb/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration,org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration \ No newline at end of file diff --git a/spring-data-disable-auto-configuration/spring-data-mongodb/src/main/resources/logback.xml b/spring-data-disable-auto-configuration/spring-data-mongodb/src/main/resources/logback.xml deleted file mode 100644 index 7d900d8ea8..0000000000 --- a/spring-data-disable-auto-configuration/spring-data-mongodb/src/main/resources/logback.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - \ No newline at end of file diff --git a/spring-data-disable-auto-configuration/spring-data-redis/README.md b/spring-data-disable-auto-configuration/spring-data-redis/README.md deleted file mode 100644 index b91f5eda5a..0000000000 --- a/spring-data-disable-auto-configuration/spring-data-redis/README.md +++ /dev/null @@ -1,4 +0,0 @@ -This module is for Jira BAEL-2578 - - -### Relevant Articles: diff --git a/spring-data-disable-auto-configuration/spring-data-redis/pom.xml b/spring-data-disable-auto-configuration/spring-data-redis/pom.xml deleted file mode 100644 index 3b5db228c5..0000000000 --- a/spring-data-disable-auto-configuration/spring-data-redis/pom.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - 4.0.0 - com.baeldung - spring-data-redis - 0.0.1-SNAPSHOT - spring-data-redis - jar - Spring Data with Redis - - - spring-data-disable-auto-configuration - com.baeldung - 1.0.0-SNAPSHOT - - - - - org.springframework.boot - spring-boot-starter-data-redis - 2.1.6.RELEASE - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - \ No newline at end of file diff --git a/spring-data-disable-auto-configuration/spring-data-redis/src/main/resources/application.properties b/spring-data-disable-auto-configuration/spring-data-redis/src/main/resources/application.properties deleted file mode 100644 index 8c5a8dbbfd..0000000000 --- a/spring-data-disable-auto-configuration/spring-data-redis/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration, org.springframework.boot.autoconfigure.data.redis.RedisRepositoriesAutoConfiguration \ No newline at end of file diff --git a/spring-data-disable-auto-configuration/spring-data-redis/src/main/resources/logback.xml b/spring-data-disable-auto-configuration/spring-data-redis/src/main/resources/logback.xml deleted file mode 100644 index 7d900d8ea8..0000000000 --- a/spring-data-disable-auto-configuration/spring-data-redis/src/main/resources/logback.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n - - - - - - - - \ No newline at end of file