Skip to content

Commit

Permalink
Add spring-boot-properties-migrator
Browse files Browse the repository at this point in the history
  • Loading branch information
murdos committed May 17, 2020
1 parent 5731f1b commit 7568d9f
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
5 changes: 5 additions & 0 deletions generators/server/templates/build.gradle.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,11 @@ dependencies {
implementation group: "io.github.jhipster", name: "jhipster-framework"<% if (reactive) { %>, {
exclude group: "org.springframework", module: "spring-webmvc"
}<% } %>
<%_ // This is useful for major Spring Boot migration
// FIXME: remove the condition on JHIPSTER_DEPENDENCIES_VERSION once Spring Boot 2.3 migration is done
if (JHIPSTER_DEPENDENCIES_VERSION.endsWith('-SNAPSHOT') || !SPRING_BOOT_VERSION.endsWith('RELEASE')) { _%>
runtime("org.springframework.boot:spring-boot-properties-migrator")
<%_ } _%>
implementation "javax.annotation:javax.annotation-api"
<%_ if (cacheProvider !== 'no') { _%>
implementation "org.springframework.boot:spring-boot-starter-cache"
Expand Down
10 changes: 9 additions & 1 deletion generators/server/templates/pom.xml.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,15 @@
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>

<%_ // This is useful for major Spring Boot migration
// FIXME: remove the condition on JHIPSTER_DEPENDENCIES_VERSION once Spring Boot 2.3 migration is done
if (JHIPSTER_DEPENDENCIES_VERSION.endsWith('-SNAPSHOT') || !SPRING_BOOT_VERSION.endsWith('RELEASE')) { _%>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-properties-migrator</artifactId>
<scope>runtime</scope>
</dependency>
<%_ } _%>
<%_ if (cacheProvider !== 'no') { _%>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down

0 comments on commit 7568d9f

Please sign in to comment.