From ca545ac3d42f309786ec08300e5e7ddac9e6c18a Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Sun, 2 Apr 2023 19:20:49 +0200 Subject: [PATCH] Upgrade dependencies --- build.gradle | 12 +-- framework-platform/framework-platform.gradle | 78 +++++++++---------- settings.gradle | 2 +- spring-core/spring-core.gradle | 2 +- .../NestedTestsWithSpringRulesTests.java | 10 +-- 5 files changed, 49 insertions(+), 55 deletions(-) diff --git a/build.gradle b/build.gradle index aafc017b196..161fad0e771 100644 --- a/build.gradle +++ b/build.gradle @@ -1,16 +1,16 @@ plugins { id 'io.spring.nohttp' version '0.0.11' - id 'io.freefair.aspectj' version '6.5.0.3' apply false + id 'io.freefair.aspectj' version '8.0.1' apply false // kotlinVersion is managed in gradle.properties id 'org.jetbrains.kotlin.plugin.serialization' version "${kotlinVersion}" apply false id 'org.jetbrains.dokka' version '1.8.10' id 'org.asciidoctor.jvm.convert' version '3.3.2' apply false id 'org.asciidoctor.jvm.pdf' version '3.3.2' apply false id 'org.unbroken-dome.xjc' version '2.0.0' apply false - id 'com.github.ben-manes.versions' version '0.42.0' - id 'com.github.johnrengelman.shadow' version '7.1.2' apply false - id 'de.undercouch.download' version '5.1.0' - id 'me.champeau.jmh' version '0.6.8' apply false + id 'com.github.ben-manes.versions' version '0.46.0' + id 'com.github.johnrengelman.shadow' version '8.1.1' apply false + id 'de.undercouch.download' version '5.4.0' + id 'me.champeau.jmh' version '0.7.0' apply false } ext { @@ -109,7 +109,7 @@ configure([rootProject] + javaProjects) { project -> // JSR-305 only used for non-required meta-annotations compileOnly("com.google.code.findbugs:jsr305") testCompileOnly("com.google.code.findbugs:jsr305") - checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.31") + checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.38") } ext.javadocLinks = [ diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index 45908df405f..97bbb95cd19 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -13,7 +13,7 @@ dependencies { api(platform("io.netty:netty5-bom:5.0.0.Alpha5")) api(platform("io.projectreactor:reactor-bom:2022.0.5")) api(platform("io.rsocket:rsocket-bom:1.1.3")) - api(platform("org.apache.groovy:groovy-bom:4.0.8")) + api(platform("org.apache.groovy:groovy-bom:4.0.11")) api(platform("org.apache.logging.log4j:log4j-bom:2.20.0")) api(platform("org.eclipse.jetty:jetty-bom:11.0.14")) api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4")) @@ -22,18 +22,18 @@ dependencies { api(platform("org.mockito:mockito-bom:5.2.0")) constraints { - api("com.fasterxml:aalto-xml:1.3.1") + api("com.fasterxml:aalto-xml:1.3.2") api("com.fasterxml.woodstox:woodstox-core:6.5.0") - api("com.github.ben-manes.caffeine:caffeine:3.1.2") + api("com.github.ben-manes.caffeine:caffeine:3.1.5") api("com.github.librepdf:openpdf:1.3.30") api("com.google.code.findbugs:findbugs:3.0.1") api("com.google.code.findbugs:jsr305:3.0.2") - api("com.google.code.gson:gson:2.10") + api("com.google.code.gson:gson:2.10.1") api("com.google.protobuf:protobuf-java-util:3.21.12") api("com.googlecode.protobuf-java-format:protobuf-java-format:1.4") api("com.h2database:h2:2.1.214") - api("com.jayway.jsonpath:json-path:2.7.0") - api("com.rometools:rome:1.18.0") + api("com.jayway.jsonpath:json-path:2.8.0") + api("com.rometools:rome:1.19.0") api("com.squareup.okhttp3:mockwebserver:3.14.9") api("com.squareup.okhttp3:okhttp:3.14.9") api("com.sun.activation:jakarta.activation:2.0.1") @@ -41,31 +41,31 @@ dependencies { api("com.sun.xml.bind:jaxb-core:3.0.2") api("com.sun.xml.bind:jaxb-impl:3.0.2") api("com.sun.xml.bind:jaxb-xjc:3.0.2") - api("com.thoughtworks.qdox:qdox:2.0.2") - api("com.thoughtworks.xstream:xstream:1.4.19") + api("com.thoughtworks.qdox:qdox:2.0.3") + api("com.thoughtworks.xstream:xstream:1.4.20") api("commons-io:commons-io:2.11.0") - api("de.bechte.junit:junit-hierarchicalcontextrunner:4.12.1") - api("info.picocli:picocli:4.7.0") + api("de.bechte.junit:junit-hierarchicalcontextrunner:4.12.2") + api("info.picocli:picocli:4.7.1") api("io.micrometer:context-propagation:1.0.0") - api("io.mockk:mockk:1.12.1") + api("io.mockk:mockk:1.13.4") api("io.projectreactor.netty:reactor-netty5-http:2.0.0-M3") - api("io.projectreactor.tools:blockhound:1.0.6.RELEASE") + api("io.projectreactor.tools:blockhound:1.0.7.RELEASE") api("io.r2dbc:r2dbc-h2:1.0.0.RELEASE") api("io.r2dbc:r2dbc-spi-test:1.0.0.RELEASE") api("io.r2dbc:r2dbc-spi:1.0.0.RELEASE") - api("io.reactivex.rxjava3:rxjava:3.1.5") - api("io.smallrye.reactive:mutiny:1.8.0") - api("io.undertow:undertow-core:2.3.4.Final") - api("io.undertow:undertow-servlet:2.3.4.Final") - api("io.undertow:undertow-websockets-jsr:2.3.4.Final") + api("io.reactivex.rxjava3:rxjava:3.1.6") + api("io.smallrye.reactive:mutiny:1.9.0") + api("io.undertow:undertow-core:2.3.5.Final") + api("io.undertow:undertow-servlet:2.3.5.Final") + api("io.undertow:undertow-websockets-jsr:2.3.5.Final") api("io.vavr:vavr:0.10.4") api("jakarta.activation:jakarta.activation-api:2.0.1") api("jakarta.annotation:jakarta.annotation-api:2.0.0") - api("jakarta.ejb:jakarta.ejb-api:4.0.0") + api("jakarta.ejb:jakarta.ejb-api:4.0.1") api("jakarta.el:jakarta.el-api:4.0.0") api("jakarta.enterprise.concurrent:jakarta.enterprise.concurrent-api:2.0.0") api("jakarta.faces:jakarta.faces-api:3.0.0") - api("jakarta.inject:jakarta.inject-api:2.0.0") + api("jakarta.inject:jakarta.inject-api:2.0.1") api("jakarta.inject:jakarta.inject-tck:2.0.1") api("jakarta.interceptor:jakarta.interceptor-api:2.0.0") api("jakarta.jms:jakarta.jms-api:3.0.0") @@ -75,7 +75,7 @@ dependencies { api("jakarta.persistence:jakarta.persistence-api:3.0.0") api("jakarta.resource:jakarta.resource-api:2.0.0") api("jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:3.0.0") - api("jakarta.servlet.jsp:jakarta.servlet.jsp-api:3.1.0") + api("jakarta.servlet.jsp:jakarta.servlet.jsp-api:3.1.1") api("jakarta.servlet:jakarta.servlet-api:6.0.0") api("jakarta.transaction:jakarta.transaction-api:2.0.1") api("jakarta.validation:jakarta.validation-api:3.0.2") @@ -89,9 +89,9 @@ dependencies { api("net.sf.jopt-simple:jopt-simple:5.0.4") api("net.sourceforge.htmlunit:htmlunit:2.70.0") api("org.apache-extras.beanshell:bsh:2.0b6") - api("org.apache.activemq:activemq-broker:5.16.2") - api("org.apache.activemq:activemq-kahadb-store:5.16.2") - api("org.apache.activemq:activemq-stomp:5.16.2") + api("org.apache.activemq:activemq-broker:5.17.2") + api("org.apache.activemq:activemq-kahadb-store:5.17.2") + api("org.apache.activemq:activemq-stomp:5.17.2") api("org.apache.commons:commons-pool2:2.9.0") api("org.apache.derby:derby:10.16.1.1") api("org.apache.derby:derbyclient:10.16.1.1") @@ -103,41 +103,41 @@ dependencies { api("org.apache.tomcat.embed:tomcat-embed-websocket:10.1.7") api("org.apache.tomcat:tomcat-util:10.1.7") api("org.apache.tomcat:tomcat-websocket:10.1.7") - api("org.aspectj:aspectjrt:1.9.9.1") - api("org.aspectj:aspectjtools:1.9.9.1") - api("org.aspectj:aspectjweaver:1.9.9.1") + api("org.aspectj:aspectjrt:1.9.19") + api("org.aspectj:aspectjtools:1.9.19") + api("org.aspectj:aspectjweaver:1.9.19") api("org.assertj:assertj-core:3.24.2") - api("org.awaitility:awaitility:3.1.6") - api("org.bouncycastle:bcpkix-jdk18on:1.71") - api("org.codehaus.jettison:jettison:1.3.8") - api("org.dom4j:dom4j:2.1.3") - api("org.eclipse.jetty:jetty-reactive-httpclient:3.0.7") + api("org.awaitility:awaitility:4.2.0") + api("org.bouncycastle:bcpkix-jdk18on:1.72") + api("org.codehaus.jettison:jettison:1.5.4") + api("org.dom4j:dom4j:2.1.4") + api("org.eclipse.jetty:jetty-reactive-httpclient:3.0.8") api("org.eclipse.persistence:org.eclipse.persistence.jpa:3.0.3") api("org.eclipse:yasson:2.0.4") - api("org.ehcache:ehcache:3.4.0") + api("org.ehcache:ehcache:3.10.8") api("org.ehcache:jcache:1.0.1") api("org.freemarker:freemarker:2.3.32") // Substitute for "javax.management:jmxremote_optional:1.0.1_04" which // is not available on Maven Central api("org.glassfish.external:opendmk_jmxremote_optional_jar:1.0-b01-ea") - api("org.glassfish.tyrus:tyrus-container-servlet:2.0.1") + api("org.glassfish.tyrus:tyrus-container-servlet:2.1.3") api("org.glassfish:jakarta.el:4.0.2") - api("org.graalvm.sdk:graal-sdk:22.3.0") + api("org.graalvm.sdk:graal-sdk:22.3.1") api("org.hamcrest:hamcrest:2.2") api("org.hibernate:hibernate-core-jakarta:5.6.15.Final") api("org.hibernate:hibernate-validator:7.0.5.Final") api("org.hsqldb:hsqldb:2.7.1") api("org.javamoney:moneta:1.4.2") - api("org.jruby:jruby:9.4.0.0") + api("org.jruby:jruby:9.4.2.0") api("org.junit.support:testng-engine:1.0.4") - api("org.mozilla:rhino:1.7.11") + api("org.mozilla:rhino:1.7.14") api("org.ogce:xpp3:1.1.6") - api("org.python:jython-standalone:2.7.1") + api("org.python:jython-standalone:2.7.3") api("org.quartz-scheduler:quartz:2.3.2") api("org.seleniumhq.selenium:htmlunit-driver:2.70.0") api("org.seleniumhq.selenium:selenium-java:3.141.59") - api("org.skyscreamer:jsonassert:1.5.0") - api("org.slf4j:slf4j-api:2.0.6") + api("org.skyscreamer:jsonassert:1.5.1") + api("org.slf4j:slf4j-api:2.0.7") api("org.testng:testng:7.7.1") api("org.webjars:underscorejs:1.8.3") api("org.webjars:webjars-locator-core:0.52") diff --git a/settings.gradle b/settings.gradle index b65c0d3d18a..db9424fc990 100644 --- a/settings.gradle +++ b/settings.gradle @@ -7,7 +7,7 @@ pluginManagement { } plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.enterprise" version "3.12.6" id "io.spring.ge.conventions" version "0.0.13" } diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle index 21d265aaa83..a5c503f6234 100644 --- a/spring-core/spring-core.gradle +++ b/spring-core/spring-core.gradle @@ -7,7 +7,7 @@ apply plugin: "kotlin" apply plugin: "kotlinx-serialization" def javapoetVersion = "1.13.0" -def objenesisVersion = "3.2" +def objenesisVersion = "3.3" configurations { javapoet diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/nested/NestedTestsWithSpringRulesTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/nested/NestedTestsWithSpringRulesTests.java index 5da148af5d0..cf260e24185 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit4/nested/NestedTestsWithSpringRulesTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit4/nested/NestedTestsWithSpringRulesTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2023 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. @@ -62,13 +62,7 @@ public class NestedTestsWithSpringRulesTests extends SpringRuleConfigurer { @Test public void nestedTest() throws Exception { - // Note: the following would fail since TestExecutionListeners in - // the Spring TestContext Framework are not applied to the enclosing - // instance of an inner test class. - // - // assertEquals("foo", foo); - - assertThat(foo).as("@Autowired field in enclosing instance should be null.").isNull(); + assertThat(foo).isEqualTo("foo"); assertThat(bar).isEqualTo("bar"); } }