diff --git a/gradle.properties b/gradle.properties index 10fc6de8..59f86b03 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,7 +30,7 @@ SOURCE_COMPATIBILITY=1.8 TARGET_COMPATIBILITY=1.8 ### Dependencies LIB_GRAPHQL_JAVA_VER=18.0 -LIB_EXTENDED_SCALARS_VER=17.0 +LIB_EXTENDED_SCALARS_VER=18.0 LIB_SPRING_BOOT_VER=2.6.7 LIB_GRAPHQL_SERVLET_VER=13.0.0-SNAPSHOT LIB_GRAPHQL_JAVA_TOOLS_VER=12.0.2 diff --git a/graphql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/autoconfigure/web/servlet/test/aliasedscalars/AliasedScalarsIncorrectConfigurationTest.java b/graphql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/autoconfigure/web/servlet/test/aliasedscalars/AliasedScalarsIncorrectConfigurationTest.java index afda1a5d..7ab6d6ec 100644 --- a/graphql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/autoconfigure/web/servlet/test/aliasedscalars/AliasedScalarsIncorrectConfigurationTest.java +++ b/graphql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/autoconfigure/web/servlet/test/aliasedscalars/AliasedScalarsIncorrectConfigurationTest.java @@ -34,9 +34,9 @@ void shouldThrowErrorOnStartupIfScalarDoesNotExists() { "Scalar(s) 'BugDecimal' cannot be aliased." + " Only the following scalars can be aliased by configuration: BigDecimal," + " BigInteger, Boolean, Byte, Char, Date, DateTime, Float, ID, Int, JSON," - + " Locale, Long, NegativeFloat, NegativeInt, NonNegativeFloat, NonNegativeInt," + + " LocalTime, Locale, Long, NegativeFloat, NegativeInt, NonNegativeFloat, NonNegativeInt," + " NonPositiveFloat, NonPositiveInt, Object, PositiveFloat, PositiveInt, Short," - + " String, Time, Url. Note that custom scalar beans cannot be aliased this way."); + + " String, Time, UUID, Url. Note that custom scalar beans cannot be aliased this way."); } @Test diff --git a/graphql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/autoconfigure/web/servlet/test/extendedscalars/ExtendedScalarsTest.java b/graphql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/autoconfigure/web/servlet/test/extendedscalars/ExtendedScalarsTest.java index 15238f11..8b2cc78e 100644 --- a/graphql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/autoconfigure/web/servlet/test/extendedscalars/ExtendedScalarsTest.java +++ b/graphql-spring-boot-autoconfigure/src/test/java/graphql/kickstart/autoconfigure/web/servlet/test/extendedscalars/ExtendedScalarsTest.java @@ -31,9 +31,9 @@ void shouldThrowErrorOnStartupIfExtendedScalarDoesNotExists() { .isThrownBy(application::run) .withMessage( "Invalid extended scalar name(s) found: BadDecimal, Datee. Valid names are: BigDecimal, " - + "BigInteger, Byte, Char, Date, DateTime, JSON, Locale, Long, NegativeFloat, NegativeInt, " + + "BigInteger, Byte, Char, Date, DateTime, JSON, LocalTime, Locale, Long, NegativeFloat, NegativeInt, " + "NonNegativeFloat, NonNegativeInt, NonPositiveFloat, NonPositiveInt, Object, PositiveFloat, " - + "PositiveInt, Short, Time, Url."); + + "PositiveInt, Short, Time, UUID, Url."); } @Test