From 707bc36d6b025789f3827482492f3fe1f08be1af Mon Sep 17 00:00:00 2001 From: Spring Builds Date: Tue, 21 Feb 2023 10:52:10 +0000 Subject: [PATCH 1/3] Next development version (v1.1.3-SNAPSHOT) --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 9dbcef77..e7547ad6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=1.1.2-SNAPSHOT +version=1.1.3-SNAPSHOT org.gradle.caching=true org.gradle.daemon=true From 27f0f64c81aaba71c6df9bf54e5e202ff4a4bcd1 Mon Sep 17 00:00:00 2001 From: Tim te Beek Date: Tue, 28 Feb 2023 14:07:30 +0100 Subject: [PATCH 2/3] Use SpringJunitConfig in tests Co-authored-by: Moderne See gh-622 --- .../data/query/jpa/QueryByExampleDataFetcherJpaTests.java | 7 ++----- .../query/mongo/QueryByExampleDataFetcherMongoDbTests.java | 7 ++----- .../QueryByExampleDataFetcherReactiveMongoDbTests.java | 7 ++----- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/spring-graphql/src/test/java/org/springframework/graphql/data/query/jpa/QueryByExampleDataFetcherJpaTests.java b/spring-graphql/src/test/java/org/springframework/graphql/data/query/jpa/QueryByExampleDataFetcherJpaTests.java index 14f787f8..2c5894f8 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/data/query/jpa/QueryByExampleDataFetcherJpaTests.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/data/query/jpa/QueryByExampleDataFetcherJpaTests.java @@ -30,7 +30,6 @@ import jakarta.persistence.EntityManagerFactory; import graphql.schema.DataFetcher; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import reactor.core.publisher.Mono; import org.springframework.beans.factory.annotation.Autowired; @@ -53,8 +52,7 @@ import org.springframework.lang.Nullable; import org.springframework.orm.jpa.JpaTransactionManager; import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit.jupiter.SpringExtension; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import org.springframework.transaction.PlatformTransactionManager; import static org.assertj.core.api.Assertions.assertThat; @@ -65,8 +63,7 @@ import static org.mockito.Mockito.when; /** * Unit tests for {@link QueryByExampleDataFetcher}. */ -@ExtendWith(SpringExtension.class) -@ContextConfiguration +@SpringJUnitConfig class QueryByExampleDataFetcherJpaTests { @Autowired diff --git a/spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/QueryByExampleDataFetcherMongoDbTests.java b/spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/QueryByExampleDataFetcherMongoDbTests.java index 3812e47b..7251039f 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/QueryByExampleDataFetcherMongoDbTests.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/QueryByExampleDataFetcherMongoDbTests.java @@ -27,7 +27,6 @@ import java.util.stream.Collectors; import com.mongodb.client.MongoClients; import graphql.schema.DataFetcher; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import org.testcontainers.containers.MongoDBContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; @@ -51,8 +50,7 @@ import org.springframework.graphql.server.WebGraphQlRequest; import org.springframework.graphql.server.WebGraphQlResponse; import org.springframework.http.HttpHeaders; import org.springframework.lang.Nullable; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit.jupiter.SpringExtension; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.any; @@ -62,8 +60,7 @@ import static org.mockito.Mockito.when; /** * Unit tests for {@link QueryByExampleDataFetcher}. */ -@ExtendWith(SpringExtension.class) -@ContextConfiguration +@SpringJUnitConfig @Testcontainers(disabledWithoutDocker = true) class QueryByExampleDataFetcherMongoDbTests { diff --git a/spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/QueryByExampleDataFetcherReactiveMongoDbTests.java b/spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/QueryByExampleDataFetcherReactiveMongoDbTests.java index 7caa6e82..46847402 100644 --- a/spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/QueryByExampleDataFetcherReactiveMongoDbTests.java +++ b/spring-graphql/src/test/java/org/springframework/graphql/data/query/mongo/QueryByExampleDataFetcherReactiveMongoDbTests.java @@ -25,7 +25,6 @@ import java.util.stream.Collectors; import com.mongodb.reactivestreams.client.MongoClients; import graphql.schema.DataFetcher; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import org.testcontainers.containers.MongoDBContainer; import org.testcontainers.junit.jupiter.Container; import org.testcontainers.junit.jupiter.Testcontainers; @@ -50,16 +49,14 @@ import org.springframework.graphql.server.WebGraphQlHandler; import org.springframework.graphql.server.WebGraphQlResponse; import org.springframework.http.HttpHeaders; import org.springframework.lang.Nullable; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit.jupiter.SpringExtension; +import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import static org.assertj.core.api.Assertions.assertThat; /** * Unit tests for {@link QueryByExampleDataFetcher}. */ -@ExtendWith(SpringExtension.class) -@ContextConfiguration +@SpringJUnitConfig @Testcontainers(disabledWithoutDocker = true) class QueryByExampleDataFetcherReactiveMongoDbTests { From 3b100c6047b82759b1c3fdfff1c34eb6a004c264 Mon Sep 17 00:00:00 2001 From: rstoyanchev Date: Thu, 2 Mar 2023 12:15:08 +0000 Subject: [PATCH 3/3] Update Java version in .sdkmanrc Closes gh-622 --- .sdkmanrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.sdkmanrc b/.sdkmanrc index a5954567..daabd844 100644 --- a/.sdkmanrc +++ b/.sdkmanrc @@ -1,3 +1,3 @@ # Enable auto-env through the sdkman_auto_env config # Add key=value pairs of SDKs to use below -java=8.0.322-librca +java=17.0.6-librca \ No newline at end of file