diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml index 1b4cc0a753..5a20ff5602 100644 --- a/spring-boot/pom.xml +++ b/spring-boot/pom.xml @@ -24,7 +24,11 @@ 4.3.1.RELEASE - + + + org.springframework.boot + spring-boot-starter-thymeleaf + org.springframework.boot spring-boot-starter-web @@ -80,6 +84,17 @@ 3.1.7 test + + + org.webjars + bootstrap + 3.3.4 + + + org.webjars + jquery + 2.1.4 + diff --git a/webjars/src/main/java/com/baeldung/TestController.java b/spring-boot/src/main/java/com/baeldung/TestController.java similarity index 100% rename from webjars/src/main/java/com/baeldung/TestController.java rename to spring-boot/src/main/java/com/baeldung/TestController.java diff --git a/webjars/src/main/java/com/baeldung/WebjarsdemoApplication.java b/spring-boot/src/main/java/com/baeldung/WebjarsdemoApplication.java similarity index 100% rename from webjars/src/main/java/com/baeldung/WebjarsdemoApplication.java rename to spring-boot/src/main/java/com/baeldung/WebjarsdemoApplication.java diff --git a/webjars/src/main/resources/templates/index.html b/spring-boot/src/main/resources/templates/index.html similarity index 100% rename from webjars/src/main/resources/templates/index.html rename to spring-boot/src/main/resources/templates/index.html diff --git a/webjars/src/test/java/com/baeldung/WebjarsdemoApplicationTests.java b/spring-boot/src/test/java/com/baeldung/WebjarsdemoApplicationTests.java similarity index 100% rename from webjars/src/test/java/com/baeldung/WebjarsdemoApplicationTests.java rename to spring-boot/src/test/java/com/baeldung/WebjarsdemoApplicationTests.java diff --git a/webjars/pom.xml b/webjars/pom.xml deleted file mode 100644 index 80e4f0a42a..0000000000 --- a/webjars/pom.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - 4.0.0 - - com.baeldung - webjarsdemo - 0.0.1-SNAPSHOT - jar - - webjarsdemo - Demo project for webjars using Spring Boot - - - org.springframework.boot - spring-boot-starter-parent - 1.3.5.RELEASE - - - - - UTF-8 - 1.8 - - - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-test - test - - - org.webjars - bootstrap - 3.3.4 - - - org.webjars - jquery - 2.1.4 - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - -