From d3b1630927a7ebd76a0ddceaeea54137952fac51 Mon Sep 17 00:00:00 2001 From: Loredana Date: Sun, 21 Apr 2019 11:37:57 +0300 Subject: [PATCH 1/4] rename config project, formatting --- pom.xml | 3 +- spring-boot-configuration/README.MD | 0 spring-boot-configuration/pom.xml | 41 ------------------- .../.gitignore | 0 spring-boot-ops-2/README.MD | 3 ++ spring-boot-ops-2/pom.xml | 41 +++++++++++++++++++ .../SpringBootConfigurationApplication.java | 6 +-- .../resources/application-tomcat.properties | 0 .../src/main/resources/application.properties | 0 .../SpringContextIntegrationTest.java | 6 +-- 10 files changed, 52 insertions(+), 48 deletions(-) delete mode 100644 spring-boot-configuration/README.MD delete mode 100644 spring-boot-configuration/pom.xml rename {spring-boot-configuration => spring-boot-ops-2}/.gitignore (100%) create mode 100644 spring-boot-ops-2/README.MD create mode 100644 spring-boot-ops-2/pom.xml rename {spring-boot-configuration => spring-boot-ops-2}/src/main/java/com/baeldung/springbootconfiguration/SpringBootConfigurationApplication.java (65%) rename {spring-boot-configuration => spring-boot-ops-2}/src/main/resources/application-tomcat.properties (100%) rename {spring-boot-configuration => spring-boot-ops-2}/src/main/resources/application.properties (100%) rename {spring-boot-configuration => spring-boot-ops-2}/src/test/java/com/baeldung/springbootconfiguration/SpringContextIntegrationTest.java (86%) diff --git a/pom.xml b/pom.xml index 0de4a36336..f09ea36d4f 100644 --- a/pom.xml +++ b/pom.xml @@ -631,6 +631,7 @@ spring-boot-mvc spring-boot-mvc-birt spring-boot-ops + spring-boot-ops-2 spring-boot-rest spring-boot-data spring-boot-property-exp @@ -1275,7 +1276,6 @@ spring-boot-camel spring-boot-client - spring-boot-configuration spring-boot-crud spring-boot-ctx-fluent spring-boot-custom-starter @@ -1287,6 +1287,7 @@ spring-boot-mvc spring-boot-mvc-birt spring-boot-ops + spring-boot-ops-2 spring-boot-rest spring-boot-data spring-boot-property-exp diff --git a/spring-boot-configuration/README.MD b/spring-boot-configuration/README.MD deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/spring-boot-configuration/pom.xml b/spring-boot-configuration/pom.xml deleted file mode 100644 index 2ecef7bb02..0000000000 --- a/spring-boot-configuration/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - 4.0.0 - - - parent-boot-2 - com.baeldung - 0.0.1-SNAPSHOT - ../parent-boot-2 - - - com.baeldung - spring-boot-configuration - 0.0.1-SNAPSHOT - spring-boot-configuration - Demo project for Spring Boot configuration - - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - diff --git a/spring-boot-configuration/.gitignore b/spring-boot-ops-2/.gitignore similarity index 100% rename from spring-boot-configuration/.gitignore rename to spring-boot-ops-2/.gitignore diff --git a/spring-boot-ops-2/README.MD b/spring-boot-ops-2/README.MD new file mode 100644 index 0000000000..20b30515fb --- /dev/null +++ b/spring-boot-ops-2/README.MD @@ -0,0 +1,3 @@ +### Relevant Articles + +- [How to Configure Spring Boot Tomcat](https://www.baeldung.com/spring-boot-configure-tomcat) \ No newline at end of file diff --git a/spring-boot-ops-2/pom.xml b/spring-boot-ops-2/pom.xml new file mode 100644 index 0000000000..dc5280df48 --- /dev/null +++ b/spring-boot-ops-2/pom.xml @@ -0,0 +1,41 @@ + + + 4.0.0 + + + parent-boot-2 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-2 + + + com.baeldung + spring-boot-ops-2 + 0.0.1-SNAPSHOT + spring-boot-ops-2 + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/spring-boot-configuration/src/main/java/com/baeldung/springbootconfiguration/SpringBootConfigurationApplication.java b/spring-boot-ops-2/src/main/java/com/baeldung/springbootconfiguration/SpringBootConfigurationApplication.java similarity index 65% rename from spring-boot-configuration/src/main/java/com/baeldung/springbootconfiguration/SpringBootConfigurationApplication.java rename to spring-boot-ops-2/src/main/java/com/baeldung/springbootconfiguration/SpringBootConfigurationApplication.java index b4f5681475..96297459a4 100644 --- a/spring-boot-configuration/src/main/java/com/baeldung/springbootconfiguration/SpringBootConfigurationApplication.java +++ b/spring-boot-ops-2/src/main/java/com/baeldung/springbootconfiguration/SpringBootConfigurationApplication.java @@ -6,8 +6,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication public class SpringBootConfigurationApplication { - public static void main(String[] args) { - SpringApplication.run(SpringBootConfigurationApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(SpringBootConfigurationApplication.class, args); + } } diff --git a/spring-boot-configuration/src/main/resources/application-tomcat.properties b/spring-boot-ops-2/src/main/resources/application-tomcat.properties similarity index 100% rename from spring-boot-configuration/src/main/resources/application-tomcat.properties rename to spring-boot-ops-2/src/main/resources/application-tomcat.properties diff --git a/spring-boot-configuration/src/main/resources/application.properties b/spring-boot-ops-2/src/main/resources/application.properties similarity index 100% rename from spring-boot-configuration/src/main/resources/application.properties rename to spring-boot-ops-2/src/main/resources/application.properties diff --git a/spring-boot-configuration/src/test/java/com/baeldung/springbootconfiguration/SpringContextIntegrationTest.java b/spring-boot-ops-2/src/test/java/com/baeldung/springbootconfiguration/SpringContextIntegrationTest.java similarity index 86% rename from spring-boot-configuration/src/test/java/com/baeldung/springbootconfiguration/SpringContextIntegrationTest.java rename to spring-boot-ops-2/src/test/java/com/baeldung/springbootconfiguration/SpringContextIntegrationTest.java index d6b2b50a2f..8ae49f6696 100644 --- a/spring-boot-configuration/src/test/java/com/baeldung/springbootconfiguration/SpringContextIntegrationTest.java +++ b/spring-boot-ops-2/src/test/java/com/baeldung/springbootconfiguration/SpringContextIntegrationTest.java @@ -9,8 +9,8 @@ import org.springframework.test.context.junit4.SpringRunner; @SpringBootTest public class SpringContextIntegrationTest { - @Test - public void contextLoads() { - } + @Test + public void contextLoads() { + } } From 884f0a7d8a230563683e2df4bb8f3fc22a7416d7 Mon Sep 17 00:00:00 2001 From: Loredana Date: Sun, 21 Apr 2019 11:39:44 +0300 Subject: [PATCH 2/4] update pom --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index f09ea36d4f..f4bc47dd44 100644 --- a/pom.xml +++ b/pom.xml @@ -821,7 +821,6 @@ spring-boot-bootstrap spring-boot-camel spring-boot-client - spring-boot-configuration spring-boot-custom-starter greeter-spring-boot-autoconfigure greeter-spring-boot-sample-app From 0ae452d0a6f1e1ff59a9003434ebc3e4f6f310bb Mon Sep 17 00:00:00 2001 From: Loredana Date: Sun, 21 Apr 2019 17:14:55 +0300 Subject: [PATCH 3/4] update pom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f4bc47dd44..b0c350fb6a 100644 --- a/pom.xml +++ b/pom.xml @@ -619,7 +619,7 @@ spring-boot-camel spring-boot-client - spring-boot-configuration + spring-boot-crud spring-boot-ctx-fluent spring-boot-custom-starter From 7c73610226936b6283bad8d8164b7f7410e8c1e2 Mon Sep 17 00:00:00 2001 From: Loredana Crusoveanu Date: Fri, 26 Apr 2019 22:57:17 +0300 Subject: [PATCH 4/4] Update SpringContextIntegrationTest.java --- .../springbootconfiguration/SpringContextIntegrationTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/spring-boot-ops-2/src/test/java/com/baeldung/springbootconfiguration/SpringContextIntegrationTest.java b/spring-boot-ops-2/src/test/java/com/baeldung/springbootconfiguration/SpringContextIntegrationTest.java index 8ae49f6696..24bef73ef9 100644 --- a/spring-boot-ops-2/src/test/java/com/baeldung/springbootconfiguration/SpringContextIntegrationTest.java +++ b/spring-boot-ops-2/src/test/java/com/baeldung/springbootconfiguration/SpringContextIntegrationTest.java @@ -12,5 +12,4 @@ public class SpringContextIntegrationTest { @Test public void contextLoads() { } - }