From 28f88b0ca3f3f15caa452a46083eb505ee7dc2cd Mon Sep 17 00:00:00 2001
From: Anil Bhaskar <anilbhaskar.cse@gmail.com>
Date: Wed, 31 Aug 2016 01:50:06 +0530
Subject: [PATCH] adding webjars code to spring-boot (#648)

merging the code and webjars different project cleanup
---
 spring-boot/pom.xml                           | 17 ++++-
 .../java/com/baeldung/TestController.java     |  0
 .../com/baeldung/WebjarsdemoApplication.java  |  0
 .../src/main/resources/templates/index.html   |  0
 .../baeldung/WebjarsdemoApplicationTests.java |  0
 webjars/pom.xml                               | 63 -------------------
 6 files changed, 16 insertions(+), 64 deletions(-)
 rename {webjars => spring-boot}/src/main/java/com/baeldung/TestController.java (100%)
 rename {webjars => spring-boot}/src/main/java/com/baeldung/WebjarsdemoApplication.java (100%)
 rename {webjars => spring-boot}/src/main/resources/templates/index.html (100%)
 rename {webjars => spring-boot}/src/test/java/com/baeldung/WebjarsdemoApplicationTests.java (100%)
 delete mode 100644 webjars/pom.xml

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 @@
 		<spring.version>4.3.1.RELEASE</spring.version>
 	</properties>
 
-	<dependencies>
+	<dependencies>	
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-thymeleaf</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
@@ -80,6 +84,17 @@
 			<version>3.1.7</version>
 			<scope>test</scope>
 		</dependency>
+		
+		<dependency>
+			<groupId>org.webjars</groupId>
+			<artifactId>bootstrap</artifactId>
+			<version>3.3.4</version>
+		</dependency>
+		<dependency>
+			<groupId>org.webjars</groupId>
+			<artifactId>jquery</artifactId>
+			<version>2.1.4</version>
+		</dependency>
 	</dependencies>
 
 	<build>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-
-	<groupId>com.baeldung</groupId>
-	<artifactId>webjarsdemo</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-	<packaging>jar</packaging>
-
-	<name>webjarsdemo</name>
-	<description>Demo project for webjars using Spring Boot</description>
-
-	<parent>
-		<groupId>org.springframework.boot</groupId>
-		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.3.5.RELEASE</version>
-		<relativePath /> <!-- lookup parent from repository -->
-	</parent>
-
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>1.8</java.version>
-	</properties>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-thymeleaf</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.webjars</groupId>
-			<artifactId>bootstrap</artifactId>
-			<version>3.3.4</version>
-		</dependency>
-		<dependency>
-			<groupId>org.webjars</groupId>
-			<artifactId>jquery</artifactId>
-			<version>2.1.4</version>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
-
-
-</project>