diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index 4f5a5292a5..b5785b7b8c 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -98,6 +98,8 @@ 1.2.2.RELEASE 1.1.1.RELEASE 3.2.3.RELEASE + 2.0.0.RC2 + 1.0.2.RELEASE 2.1.2.RELEASE 2.1.1.RELEASE 1.2.3 @@ -942,6 +944,21 @@ import pom + + org.springframework.security + spring-security-jwt + ${spring-security-jwt.version} + + + org.springframework.security.oauth + spring-security-oauth + ${spring-security-oauth.version} + + + org.springframework.security.oauth + spring-security-oauth2 + ${spring-security-oauth.version} + org.thymeleaf thymeleaf diff --git a/spring-boot-samples/spring-boot-sample-flyway/pom.xml b/spring-boot-samples/spring-boot-sample-flyway/pom.xml index ea617474cc..4400734482 100644 --- a/spring-boot-samples/spring-boot-sample-flyway/pom.xml +++ b/spring-boot-samples/spring-boot-sample-flyway/pom.xml @@ -22,7 +22,7 @@ org.springframework.boot - spring-boot-starter-jdbc + spring-boot-starter-data-jpa org.flywaydb diff --git a/spring-boot-samples/spring-boot-sample-flyway/src/main/java/sample/flyway/SampleFlywayApplication.java b/spring-boot-samples/spring-boot-sample-flyway/src/main/java/sample/flyway/SampleFlywayApplication.java index 52437aadb5..0f89083ecc 100644 --- a/spring-boot-samples/spring-boot-sample-flyway/src/main/java/sample/flyway/SampleFlywayApplication.java +++ b/spring-boot-samples/spring-boot-sample-flyway/src/main/java/sample/flyway/SampleFlywayApplication.java @@ -16,17 +16,69 @@ package sample.flyway; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; @Configuration @ComponentScan @EnableAutoConfiguration -public class SampleFlywayApplication { +public class SampleFlywayApplication implements CommandLineRunner { + + @Autowired + private PersonRepository repository; + + @Override + public void run(String... args) throws Exception { + System.err.println(repository.findAll()); + } public static void main(String[] args) throws Exception { SpringApplication.run(SampleFlywayApplication.class, args); } } + +@Repository +interface PersonRepository extends CrudRepository { + +} + +@Entity +class Person { + @Id + @GeneratedValue + private Long id; + private String firstName; + private String lastName; + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastname) { + this.lastName = lastname; + } + + @Override + public String toString() { + return "Person [firstName=" + firstName + ", lastname=" + lastName + + "]"; + } +} diff --git a/spring-boot-samples/spring-boot-sample-flyway/src/main/resources/application.properties b/spring-boot-samples/spring-boot-sample-flyway/src/main/resources/application.properties new file mode 100644 index 0000000000..ab647f3d61 --- /dev/null +++ b/spring-boot-samples/spring-boot-sample-flyway/src/main/resources/application.properties @@ -0,0 +1,2 @@ +spring.jpa.generate-ddl: false +spring.jpa.hibernate.ddl-auto: none \ No newline at end of file