lsm/initializr
1
0
Fork 0
mirror of https://gitee.com/dcren/initializr.git synced 2025-04-05 17:38:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Upgrade to Spring Boot 2.2.0

Browse Source
This commit is contained in:
Stephane Nicoll 2019-10-16 11:31:07 +02:00
parent 8abd0a8d5c
commit a729fae5d3
7 changed files with 20 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
initializr-actuator/pom.xml
View File

@ -62,21 +62,10 @@
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<exclusions>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency>
<dependency>

4
initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/documentation/HelpDocumentTests.java
View File

@ -25,7 +25,7 @@ import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoInteractions;
/**
* Tests for {@link HelpDocument}.
@ -41,7 +41,7 @@ class HelpDocumentTests {
HelpDocument document = new HelpDocument(this.templateRenderer);
PrintWriter out = mock(PrintWriter.class);
document.write(out);
verifyZeroInteractions(out);
verifyNoInteractions(out);
}
@Test

4
initializr-generator/src/test/java/io/spring/initializr/generator/project/ProjectGeneratorTests.java
View File

@ -32,7 +32,7 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.BDDMockito.given;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoInteractions;
/**
* Tests for {@link ProjectGenerator}.
@ -103,7 +103,7 @@ public class ProjectGeneratorTests {
ProjectDescription descriptionFromContext = generator.generate(description,
(context) -> context.getBean(ProjectDescription.class));
assertThat(descriptionFromContext).isSameAs(description);
verifyZeroInteractions(customizer);
verifyNoInteractions(customizer);
}
@Test

21
initializr-parent/pom.xml
View File

@ -17,10 +17,9 @@
<java.version>1.8</java.version>
<commons-compress.version>1.19</commons-compress.version>
<commons-text.version>1.7</commons-text.version>
<junit-jupiter.version>5.5.2</junit-jupiter.version>
<maven.version>3.6.1</maven.version>
<maven-resolver.version>1.3.3</maven-resolver.version>
<spring-boot.version>2.1.9.RELEASE</spring-boot.version>
<spring-boot.version>2.2.0.RELEASE</spring-boot.version>
<spring-cloud-contract.version>2.1.1.RELEASE</spring-cloud-contract.version>
</properties>
<scm>
@ -56,13 +55,6 @@
<artifactId>maven-resolver-transport-http</artifactId>
<version>${maven-resolver.version}</version>
</dependency>
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>${junit-jupiter.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
@ -70,6 +62,17 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>${spring-boot.version}</version>
<exclusions>
<exclusion>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-contract-dependencies</artifactId>

13
initializr-web/pom.xml
View File

@ -67,22 +67,11 @@
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.spring.initializr</groupId>

2
initializr-web/src/main/java/io/spring/initializr/web/mapper/InitializrMetadataV21JsonMapper.java
View File

@ -66,7 +66,7 @@ public class InitializrMetadataV21JsonMapper extends InitializrMetadataV2JsonMap
private ObjectNode dependenciesLink(String appUrl) {
String uri = (appUrl != null) ? appUrl + "/dependencies" : "/dependencies";
UriTemplate uriTemplate = new UriTemplate(uri, this.dependenciesVariables);
UriTemplate uriTemplate = UriTemplate.of(uri, this.dependenciesVariables);
ObjectNode result = nodeFactory().objectNode();
result.put("href", uriTemplate.toString());
result.put("templated", true);

2
initializr-web/src/main/java/io/spring/initializr/web/mapper/InitializrMetadataV2JsonMapper.java
View File

@ -106,7 +106,7 @@ public class InitializrMetadataV2JsonMapper implements InitializrMetadataJsonMap
private String generateTemplatedUri(String appUrl, Type type) {
String uri = (appUrl != null) ? appUrl + type.getAction() : type.getAction();
uri = uri + "?type=" + type.getId();
UriTemplate uriTemplate = new UriTemplate(uri, this.templateVariables);
UriTemplate uriTemplate = UriTemplate.of(uri, this.templateVariables);
return uriTemplate.toString();
}