From 5944041f2ab6eb33a7035954c9e2b2af81f22f7c Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 11 Nov 2021 17:46:29 +0000 Subject: [PATCH] Switch to Yasson for JSON-B testing Closes gh-28615 --- spring-boot-project/spring-boot-autoconfigure/build.gradle | 2 +- .../jsonb/JsonbAutoConfigurationWithNoProviderTests.java | 4 ++-- .../spring-boot-test-autoconfigure/build.gradle | 2 +- spring-boot-project/spring-boot-test/build.gradle | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/build.gradle b/spring-boot-project/spring-boot-autoconfigure/build.gradle index dc8f5e5f74..30336b641d 100644 --- a/spring-boot-project/spring-boot-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-autoconfigure/build.gradle @@ -225,11 +225,11 @@ dependencies { testImplementation("jakarta.json:jakarta.json-api") testImplementation("jakarta.xml.ws:jakarta.xml.ws-api") testImplementation("mysql:mysql-connector-java") - testImplementation("org.apache.johnzon:johnzon-jsonb") testImplementation("org.apache.logging.log4j:log4j-to-slf4j") testImplementation("org.apache.tomcat.embed:tomcat-embed-jasper") testImplementation("org.assertj:assertj-core") testImplementation("org.awaitility:awaitility") + testImplementation("org.eclipse:yasson") testImplementation("org.hsqldb:hsqldb") testImplementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") testImplementation("org.junit.jupiter:junit-jupiter") diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jsonb/JsonbAutoConfigurationWithNoProviderTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jsonb/JsonbAutoConfigurationWithNoProviderTests.java index 9f2056543b..6dd367089c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jsonb/JsonbAutoConfigurationWithNoProviderTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jsonb/JsonbAutoConfigurationWithNoProviderTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat; * * @author Andy Wilkinson */ -@ClassPathExclusions("johnzon-jsonb-*.jar") +@ClassPathExclusions("yasson-*.jar") class JsonbAutoConfigurationWithNoProviderTests { private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() diff --git a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle b/spring-boot-project/spring-boot-test-autoconfigure/build.gradle index cf2508f877..f77960e277 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-test-autoconfigure/build.gradle @@ -86,12 +86,12 @@ dependencies { testImplementation("io.r2dbc:r2dbc-h2") testImplementation("jakarta.json:jakarta.json-api") testImplementation("org.apache.commons:commons-pool2") - testImplementation("org.apache.johnzon:johnzon-jsonb") testImplementation("org.apache.tomcat.embed:tomcat-embed-el") testImplementation("org.aspectj:aspectjrt") testImplementation("org.aspectj:aspectjweaver") testImplementation("org.assertj:assertj-core") testImplementation("org.awaitility:awaitility") + testImplementation("org.eclipse:yasson") testImplementation("org.hibernate.validator:hibernate-validator") testImplementation("org.hsqldb:hsqldb") testImplementation("org.jooq:jooq") { diff --git a/spring-boot-project/spring-boot-test/build.gradle b/spring-boot-project/spring-boot-test/build.gradle index 7571c2b34f..dc37c1cf72 100644 --- a/spring-boot-project/spring-boot-test/build.gradle +++ b/spring-boot-project/spring-boot-test/build.gradle @@ -47,7 +47,7 @@ dependencies { testImplementation("org.apache.tomcat.embed:tomcat-embed-core") testImplementation("org.codehaus.groovy:groovy") testImplementation("org.codehaus.groovy:groovy-xml") - testImplementation("org.apache.johnzon:johnzon-jsonb") + testImplementation("org.eclipse:yasson") testImplementation("org.junit.jupiter:junit-jupiter") testImplementation("org.mockito:mockito-junit-jupiter") testImplementation("org.slf4j:slf4j-api")