From b9f2c84dd3fe11d6f37cead4a448294b3aeda653 Mon Sep 17 00:00:00 2001
From: kumarandhanapal <dhanapalkumaran@gmail.com>
Date: Wed, 14 Mar 2018 16:52:33 -0400
Subject: [PATCH 1/4] Adding additional repositories

---
 pom.xml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 85eef28..26b1faf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,18 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
+  <repository>
+    <id>com.springsource.repository.bundles.release</id>
+    <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
+    <url>http://repository.springsource.com/maven/bundles/release</url>
+</repository>
+<repository>
+    <id>com.springsource.repository.bundles.external</id>
+    <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
+    <url>http://repository.springsource.com/maven/bundles/external</url>
+</repository>    
+             
+             
     </repositories>
     <pluginRepositories>
         <pluginRepository>
@@ -72,4 +84,4 @@
         </pluginRepository>
     </pluginRepositories>
 
-</project>
\ No newline at end of file
+</project>

From c10c0dcb20e2dcf8ed8acc502e9fdb69925d283a Mon Sep 17 00:00:00 2001
From: Kdhanapal <Kdhanapal@LAPTOP-KLICEUNH>
Date: Wed, 14 Mar 2018 18:23:24 -0400
Subject: [PATCH 2/4] Dependency version for vaavin got updated. Annotation has
 been changed

---
 pom.xml                                    |  1 +
 vaadin/pom.xml                             |  3 ++-
 vaadin/src/main/java/demo/Application.java | 19 +++++++------------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 85eef28..fc56421 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,4 +72,5 @@
         </pluginRepository>
     </pluginRepositories>
 
+    <version>1.0.0.RC4</version>
 </project>
\ No newline at end of file
diff --git a/vaadin/pom.xml b/vaadin/pom.xml
index c2ec82b..2f4ba7a 100644
--- a/vaadin/pom.xml
+++ b/vaadin/pom.xml
@@ -21,7 +21,8 @@
         </dependency>
         <dependency>
             <groupId>org.vaadin.spring</groupId>
-            <version>1.0-SNAPSHOT</version>
+            <!-- <version>1.0-SNAPSHOT</version> -->
+             <version>0.0.5.RELEASE</version>
             <artifactId>spring-boot-vaadin</artifactId>
         </dependency>
         <dependency>
diff --git a/vaadin/src/main/java/demo/Application.java b/vaadin/src/main/java/demo/Application.java
index 4e95127..f17072a 100644
--- a/vaadin/src/main/java/demo/Application.java
+++ b/vaadin/src/main/java/demo/Application.java
@@ -1,13 +1,8 @@
 package demo;
 
-import com.google.gwt.thirdparty.guava.common.base.Predicate;
-import com.google.gwt.thirdparty.guava.common.collect.Collections2;
-import com.google.gwt.thirdparty.guava.common.collect.ImmutableMap;
-import com.google.gwt.thirdparty.guava.common.collect.Lists;
 import com.vaadin.server.VaadinRequest;
 import com.vaadin.ui.Table;
 import com.vaadin.ui.UI;
-import org.apache.commons.beanutils.PropertyUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -15,16 +10,11 @@
 import org.springframework.boot.context.web.SpringBootServletInitializer;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.vaadin.spring.VaadinUI;
-
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.Method;
 import java.util.*;
 
 
@@ -45,10 +35,15 @@ protected SpringApplicationBuilder configure(SpringApplicationBuilder applicatio
 }
 
 
-@VaadinUI
+//@VaadinUI
+@org.vaadin.spring.annotation.VaadinUI
 class RootUI extends UI {
 
-    @Autowired
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+	@Autowired
     CustomerRepository customerRepository;
 
     @Override

From 0727b9e7be3cb5c24f73758f6cd86911ef6c3dd5 Mon Sep 17 00:00:00 2001
From: kumarandhanapal <dhanapalkumaran@gmail.com>
Date: Wed, 14 Mar 2018 19:08:29 -0400
Subject: [PATCH 3/4] removed the special characters

---
 pom.xml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 882d547..28ec9b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,6 +11,7 @@
     <packaging>pom</packaging>
     <groupId>bootexamples</groupId>
     <artifactId>core</artifactId>
+    <version>1.0.0.RC4</version>
 
     <properties>
         <java.version>1.7</java.version>
@@ -83,10 +84,4 @@
             </snapshots>
         </pluginRepository>
     </pluginRepositories>
-
-<<<<<<< HEAD
-    <version>1.0.0.RC4</version>
-</project>
-=======
 </project>
->>>>>>> b9f2c84dd3fe11d6f37cead4a448294b3aeda653

From 11c0b172f6223593bbfffaa947858f5b4371cf90 Mon Sep 17 00:00:00 2001
From: kumarandhanapal <dhanapalkumaran@gmail.com>
Date: Wed, 14 Mar 2018 19:11:53 -0400
Subject: [PATCH 4/4] undo additional repo

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 28ec9b2..a3cc99e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
-  <repository>
+  <!--<repository>
     <id>com.springsource.repository.bundles.release</id>
     <name>SpringSource Enterprise Bundle Repository - SpringSource Bundle Releases</name>
     <url>http://repository.springsource.com/maven/bundles/release</url>
@@ -62,7 +62,7 @@
     <id>com.springsource.repository.bundles.external</id>
     <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
     <url>http://repository.springsource.com/maven/bundles/external</url>
-</repository>    
+</repository>-->    
              
              
     </repositories>