Skip to content

Commit

Permalink
Upgrade to Spring Boot 2.4 snapshots
Browse files Browse the repository at this point in the history
in order to make use of a recent change for WebMvc.fn in
Spring Framework 5.3.

See spring-iogh-6
  • Loading branch information
rstoyanchev committed Oct 7, 2020
1 parent b5d4fe1 commit cf1e3ce
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 6 deletions.
8 changes: 6 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import org.springframework.boot.gradle.plugin.SpringBootPlugin

plugins {
id 'org.springframework.boot' version '2.3.3.RELEASE' apply false
id 'org.springframework.boot' version '2.4.0-SNAPSHOT' apply false
}

subprojects {
Expand All @@ -14,11 +16,13 @@ subprojects {

repositories {
mavenCentral()
maven { url 'https://repo.spring.io/milestone' }
maven { url "https://repo.spring.io/snapshot" }
}

dependencyManagement {
imports {
mavenBom org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES
mavenBom SpringBootPlugin.BOM_COORDINATES
}
dependencies {
dependency 'com.graphql-java:graphql-java:15.0'
Expand Down
7 changes: 7 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
pluginManagement {
repositories {
mavenCentral()
maven { url 'https://repo.spring.io/snapshot' }
}
}

rootProject.name = 'spring-graphql'
include 'spring-boot-starter-graphql-web'
include 'spring-boot-starter-graphql-webflux'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@
import org.springframework.util.ResourceUtils;

import static graphql.schema.idl.TypeRuntimeWiring.newTypeWiring;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;

/**
* Unit tests for {@link WebInterceptorExecutionChain}.
Expand Down Expand Up @@ -68,8 +67,8 @@ void testInterceptorInvocation() throws Exception {
WebOutput webOutput = new WebInterceptorExecutionChain(createGraphQL(), interceptors)
.execute(webInput).block();

assertEquals(":pre1:pre2:pre3:post3:post2:post1", sb.toString());
assertTrue(webOutput.isDataPresent());
assertThat(sb.toString()).isEqualTo(":pre1:pre2:pre3:post3:post2:post1");
assertThat(webOutput.isDataPresent()).isTrue();
}

private static GraphQL createGraphQL() throws Exception {
Expand Down

0 comments on commit cf1e3ce

Please sign in to comment.