diff --git a/pom.xml b/pom.xml index 85eef28..a3cc99e 100644 --- a/pom.xml +++ b/pom.xml @@ -11,6 +11,7 @@ pom bootexamples core + 1.0.0.RC4 1.7 @@ -52,6 +53,18 @@ false + + + @@ -71,5 +84,4 @@ - - \ 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 @@ org.vaadin.spring - 1.0-SNAPSHOT + + 0.0.5.RELEASE spring-boot-vaadin 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