Skip to content

Bugfix/# wrong version in Parent POM and updated depedencies for vaadin #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kumarandhanapal wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Bugfix/# wrong version in Parent POM and updated depedencies for vaadin #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b9f2c84
Adding additional repositories
kumarandhanapal Mar 14, 2018
c10c0dc
Dependency version for vaavin got updated. Annotation has been changed
Mar 14, 2018
1b00da0
Merge branch 'master' of https://github.com/kumarandhanapal/boot-exam…
kumarandhanapal Mar 14, 2018
0727b9e
removed the special characters
kumarandhanapal Mar 14, 2018
11c0b17
undo additional repo
kumarandhanapal Mar 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -52,6 +53,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>
Expand All @@ -71,5 +84,4 @@
</snapshots>
</pluginRepository>
</pluginRepositories>

</project>
</project>
3 changes: 2 additions & 1 deletion vaadin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
19 changes: 7 additions & 12 deletions vaadin/src/main/java/demo/Application.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,20 @@
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;
import org.springframework.boot.builder.SpringApplicationBuilder;
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.*;


Expand All @@ -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
Expand Down