root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Switch to Yasson for JSON-B testing 

Closes gh-28615
This commit is contained in:
Andy Wilkinson 2021-11-11 17:46:29 +00:00
parent 40fe9ca467
commit 5944041f2a
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/build.gradle
View File

@ -225,11 +225,11 @@ dependencies {
testImplementation("jakarta.json:jakarta.json-api") testImplementation("jakarta.json:jakarta.json-api")
testImplementation("jakarta.xml.ws:jakarta.xml.ws-api") testImplementation("jakarta.xml.ws:jakarta.xml.ws-api")
testImplementation("mysql:mysql-connector-java") testImplementation("mysql:mysql-connector-java")
testImplementation("org.apache.johnzon:johnzon-jsonb")
testImplementation("org.apache.logging.log4j:log4j-to-slf4j") testImplementation("org.apache.logging.log4j:log4j-to-slf4j")
testImplementation("org.apache.tomcat.embed:tomcat-embed-jasper") testImplementation("org.apache.tomcat.embed:tomcat-embed-jasper")
testImplementation("org.assertj:assertj-core") testImplementation("org.assertj:assertj-core")
testImplementation("org.awaitility:awaitility") testImplementation("org.awaitility:awaitility")
testImplementation("org.eclipse:yasson")
testImplementation("org.hsqldb:hsqldb") testImplementation("org.hsqldb:hsqldb")
testImplementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") testImplementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
testImplementation("org.junit.jupiter:junit-jupiter") testImplementation("org.junit.jupiter:junit-jupiter")

4
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jsonb/JsonbAutoConfigurationWithNoProviderTests.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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 * @author Andy Wilkinson
*/ */
@ClassPathExclusions("johnzon-jsonb-*.jar") @ClassPathExclusions("yasson-*.jar")
class JsonbAutoConfigurationWithNoProviderTests { class JsonbAutoConfigurationWithNoProviderTests {
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner() private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()

2
spring-boot-project/spring-boot-test-autoconfigure/build.gradle
View File

@ -86,12 +86,12 @@ dependencies {
testImplementation("io.r2dbc:r2dbc-h2") testImplementation("io.r2dbc:r2dbc-h2")
testImplementation("jakarta.json:jakarta.json-api") testImplementation("jakarta.json:jakarta.json-api")
testImplementation("org.apache.commons:commons-pool2") testImplementation("org.apache.commons:commons-pool2")
testImplementation("org.apache.johnzon:johnzon-jsonb")
testImplementation("org.apache.tomcat.embed:tomcat-embed-el") testImplementation("org.apache.tomcat.embed:tomcat-embed-el")
testImplementation("org.aspectj:aspectjrt") testImplementation("org.aspectj:aspectjrt")
testImplementation("org.aspectj:aspectjweaver") testImplementation("org.aspectj:aspectjweaver")
testImplementation("org.assertj:assertj-core") testImplementation("org.assertj:assertj-core")
testImplementation("org.awaitility:awaitility") testImplementation("org.awaitility:awaitility")
testImplementation("org.eclipse:yasson")
testImplementation("org.hibernate.validator:hibernate-validator") testImplementation("org.hibernate.validator:hibernate-validator")
testImplementation("org.hsqldb:hsqldb") testImplementation("org.hsqldb:hsqldb")
testImplementation("org.jooq:jooq") { testImplementation("org.jooq:jooq") {

2
spring-boot-project/spring-boot-test/build.gradle
View File

@ -47,7 +47,7 @@ dependencies {
testImplementation("org.apache.tomcat.embed:tomcat-embed-core") testImplementation("org.apache.tomcat.embed:tomcat-embed-core")
testImplementation("org.codehaus.groovy:groovy") testImplementation("org.codehaus.groovy:groovy")
testImplementation("org.codehaus.groovy:groovy-xml") testImplementation("org.codehaus.groovy:groovy-xml")
testImplementation("org.apache.johnzon:johnzon-jsonb") testImplementation("org.eclipse:yasson")
testImplementation("org.junit.jupiter:junit-jupiter") testImplementation("org.junit.jupiter:junit-jupiter")
testImplementation("org.mockito:mockito-junit-jupiter") testImplementation("org.mockito:mockito-junit-jupiter")
testImplementation("org.slf4j:slf4j-api") testImplementation("org.slf4j:slf4j-api")