Skip to content

Commit ca545ac

Browse files
sbrannensbrannen
committed
Upgrade dependencies
1 parent ca7c277 commit ca545ac

File tree

5 files changed

+49
-55
lines changed

5 files changed

+49
-55
lines changed

‎build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
plugins {
22
id 'io.spring.nohttp' version '0.0.11'
3-
id 'io.freefair.aspectj' version '6.5.0.3' apply false
3+
id 'io.freefair.aspectj' version '8.0.1' apply false
44
// kotlinVersion is managed in gradle.properties
55
id 'org.jetbrains.kotlin.plugin.serialization' version "${kotlinVersion}" apply false
66
id 'org.jetbrains.dokka' version '1.8.10'
77
id 'org.asciidoctor.jvm.convert' version '3.3.2' apply false
88
id 'org.asciidoctor.jvm.pdf' version '3.3.2' apply false
99
id 'org.unbroken-dome.xjc' version '2.0.0' apply false
10-
id 'com.github.ben-manes.versions' version '0.42.0'
11-
id 'com.github.johnrengelman.shadow' version '7.1.2' apply false
12-
id 'de.undercouch.download' version '5.1.0'
13-
id 'me.champeau.jmh' version '0.6.8' apply false
10+
id 'com.github.ben-manes.versions' version '0.46.0'
11+
id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
12+
id 'de.undercouch.download' version '5.4.0'
13+
id 'me.champeau.jmh' version '0.7.0' apply false
1414
}
1515

1616
ext {
@@ -109,7 +109,7 @@ configure([rootProject] + javaProjects) { project ->
109109
// JSR-305 only used for non-required meta-annotations
110110
compileOnly("com.google.code.findbugs:jsr305")
111111
testCompileOnly("com.google.code.findbugs:jsr305")
112-
checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.31")
112+
checkstyle("io.spring.javaformat:spring-javaformat-checkstyle:0.0.38")
113113
}
114114

115115
ext.javadocLinks = [

‎framework-platform/framework-platform.gradle

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies {
1313
api(platform("io.netty:netty5-bom:5.0.0.Alpha5"))
1414
api(platform("io.projectreactor:reactor-bom:2022.0.5"))
1515
api(platform("io.rsocket:rsocket-bom:1.1.3"))
16-
api(platform("org.apache.groovy:groovy-bom:4.0.8"))
16+
api(platform("org.apache.groovy:groovy-bom:4.0.11"))
1717
api(platform("org.apache.logging.log4j:log4j-bom:2.20.0"))
1818
api(platform("org.eclipse.jetty:jetty-bom:11.0.14"))
1919
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4"))
@@ -22,50 +22,50 @@ dependencies {
2222
api(platform("org.mockito:mockito-bom:5.2.0"))
2323

2424
constraints {
25-
api("com.fasterxml:aalto-xml:1.3.1")
25+
api("com.fasterxml:aalto-xml:1.3.2")
2626
api("com.fasterxml.woodstox:woodstox-core:6.5.0")
27-
api("com.github.ben-manes.caffeine:caffeine:3.1.2")
27+
api("com.github.ben-manes.caffeine:caffeine:3.1.5")
2828
api("com.github.librepdf:openpdf:1.3.30")
2929
api("com.google.code.findbugs:findbugs:3.0.1")
3030
api("com.google.code.findbugs:jsr305:3.0.2")
31-
api("com.google.code.gson:gson:2.10")
31+
api("com.google.code.gson:gson:2.10.1")
3232
api("com.google.protobuf:protobuf-java-util:3.21.12")
3333
api("com.googlecode.protobuf-java-format:protobuf-java-format:1.4")
3434
api("com.h2database:h2:2.1.214")
35-
api("com.jayway.jsonpath:json-path:2.7.0")
36-
api("com.rometools:rome:1.18.0")
35+
api("com.jayway.jsonpath:json-path:2.8.0")
36+
api("com.rometools:rome:1.19.0")
3737
api("com.squareup.okhttp3:mockwebserver:3.14.9")
3838
api("com.squareup.okhttp3:okhttp:3.14.9")
3939
api("com.sun.activation:jakarta.activation:2.0.1")
4040
api("com.sun.mail:jakarta.mail:2.0.1")
4141
api("com.sun.xml.bind:jaxb-core:3.0.2")
4242
api("com.sun.xml.bind:jaxb-impl:3.0.2")
4343
api("com.sun.xml.bind:jaxb-xjc:3.0.2")
44-
api("com.thoughtworks.qdox:qdox:2.0.2")
45-
api("com.thoughtworks.xstream:xstream:1.4.19")
44+
api("com.thoughtworks.qdox:qdox:2.0.3")
45+
api("com.thoughtworks.xstream:xstream:1.4.20")
4646
api("commons-io:commons-io:2.11.0")
47-
api("de.bechte.junit:junit-hierarchicalcontextrunner:4.12.1")
48-
api("info.picocli:picocli:4.7.0")
47+
api("de.bechte.junit:junit-hierarchicalcontextrunner:4.12.2")
48+
api("info.picocli:picocli:4.7.1")
4949
api("io.micrometer:context-propagation:1.0.0")
50-
api("io.mockk:mockk:1.12.1")
50+
api("io.mockk:mockk:1.13.4")
5151
api("io.projectreactor.netty:reactor-netty5-http:2.0.0-M3")
52-
api("io.projectreactor.tools:blockhound:1.0.6.RELEASE")
52+
api("io.projectreactor.tools:blockhound:1.0.7.RELEASE")
5353
api("io.r2dbc:r2dbc-h2:1.0.0.RELEASE")
5454
api("io.r2dbc:r2dbc-spi-test:1.0.0.RELEASE")
5555
api("io.r2dbc:r2dbc-spi:1.0.0.RELEASE")
56-
api("io.reactivex.rxjava3:rxjava:3.1.5")
57-
api("io.smallrye.reactive:mutiny:1.8.0")
58-
api("io.undertow:undertow-core:2.3.4.Final")
59-
api("io.undertow:undertow-servlet:2.3.4.Final")
60-
api("io.undertow:undertow-websockets-jsr:2.3.4.Final")
56+
api("io.reactivex.rxjava3:rxjava:3.1.6")
57+
api("io.smallrye.reactive:mutiny:1.9.0")
58+
api("io.undertow:undertow-core:2.3.5.Final")
59+
api("io.undertow:undertow-servlet:2.3.5.Final")
60+
api("io.undertow:undertow-websockets-jsr:2.3.5.Final")
6161
api("io.vavr:vavr:0.10.4")
6262
api("jakarta.activation:jakarta.activation-api:2.0.1")
6363
api("jakarta.annotation:jakarta.annotation-api:2.0.0")
64-
api("jakarta.ejb:jakarta.ejb-api:4.0.0")
64+
api("jakarta.ejb:jakarta.ejb-api:4.0.1")
6565
api("jakarta.el:jakarta.el-api:4.0.0")
6666
api("jakarta.enterprise.concurrent:jakarta.enterprise.concurrent-api:2.0.0")
6767
api("jakarta.faces:jakarta.faces-api:3.0.0")
68-
api("jakarta.inject:jakarta.inject-api:2.0.0")
68+
api("jakarta.inject:jakarta.inject-api:2.0.1")
6969
api("jakarta.inject:jakarta.inject-tck:2.0.1")
7070
api("jakarta.interceptor:jakarta.interceptor-api:2.0.0")
7171
api("jakarta.jms:jakarta.jms-api:3.0.0")
@@ -75,7 +75,7 @@ dependencies {
7575
api("jakarta.persistence:jakarta.persistence-api:3.0.0")
7676
api("jakarta.resource:jakarta.resource-api:2.0.0")
7777
api("jakarta.servlet.jsp.jstl:jakarta.servlet.jsp.jstl-api:3.0.0")
78-
api("jakarta.servlet.jsp:jakarta.servlet.jsp-api:3.1.0")
78+
api("jakarta.servlet.jsp:jakarta.servlet.jsp-api:3.1.1")
7979
api("jakarta.servlet:jakarta.servlet-api:6.0.0")
8080
api("jakarta.transaction:jakarta.transaction-api:2.0.1")
8181
api("jakarta.validation:jakarta.validation-api:3.0.2")
@@ -89,9 +89,9 @@ dependencies {
8989
api("net.sf.jopt-simple:jopt-simple:5.0.4")
9090
api("net.sourceforge.htmlunit:htmlunit:2.70.0")
9191
api("org.apache-extras.beanshell:bsh:2.0b6")
92-
api("org.apache.activemq:activemq-broker:5.16.2")
93-
api("org.apache.activemq:activemq-kahadb-store:5.16.2")
94-
api("org.apache.activemq:activemq-stomp:5.16.2")
92+
api("org.apache.activemq:activemq-broker:5.17.2")
93+
api("org.apache.activemq:activemq-kahadb-store:5.17.2")
94+
api("org.apache.activemq:activemq-stomp:5.17.2")
9595
api("org.apache.commons:commons-pool2:2.9.0")
9696
api("org.apache.derby:derby:10.16.1.1")
9797
api("org.apache.derby:derbyclient:10.16.1.1")
@@ -103,41 +103,41 @@ dependencies {
103103
api("org.apache.tomcat.embed:tomcat-embed-websocket:10.1.7")
104104
api("org.apache.tomcat:tomcat-util:10.1.7")
105105
api("org.apache.tomcat:tomcat-websocket:10.1.7")
106-
api("org.aspectj:aspectjrt:1.9.9.1")
107-
api("org.aspectj:aspectjtools:1.9.9.1")
108-
api("org.aspectj:aspectjweaver:1.9.9.1")
106+
api("org.aspectj:aspectjrt:1.9.19")
107+
api("org.aspectj:aspectjtools:1.9.19")
108+
api("org.aspectj:aspectjweaver:1.9.19")
109109
api("org.assertj:assertj-core:3.24.2")
110-
api("org.awaitility:awaitility:3.1.6")
111-
api("org.bouncycastle:bcpkix-jdk18on:1.71")
112-
api("org.codehaus.jettison:jettison:1.3.8")
113-
api("org.dom4j:dom4j:2.1.3")
114-
api("org.eclipse.jetty:jetty-reactive-httpclient:3.0.7")
110+
api("org.awaitility:awaitility:4.2.0")
111+
api("org.bouncycastle:bcpkix-jdk18on:1.72")
112+
api("org.codehaus.jettison:jettison:1.5.4")
113+
api("org.dom4j:dom4j:2.1.4")
114+
api("org.eclipse.jetty:jetty-reactive-httpclient:3.0.8")
115115
api("org.eclipse.persistence:org.eclipse.persistence.jpa:3.0.3")
116116
api("org.eclipse:yasson:2.0.4")
117-
api("org.ehcache:ehcache:3.4.0")
117+
api("org.ehcache:ehcache:3.10.8")
118118
api("org.ehcache:jcache:1.0.1")
119119
api("org.freemarker:freemarker:2.3.32")
120120
// Substitute for "javax.management:jmxremote_optional:1.0.1_04" which
121121
// is not available on Maven Central
122122
api("org.glassfish.external:opendmk_jmxremote_optional_jar:1.0-b01-ea")
123-
api("org.glassfish.tyrus:tyrus-container-servlet:2.0.1")
123+
api("org.glassfish.tyrus:tyrus-container-servlet:2.1.3")
124124
api("org.glassfish:jakarta.el:4.0.2")
125-
api("org.graalvm.sdk:graal-sdk:22.3.0")
125+
api("org.graalvm.sdk:graal-sdk:22.3.1")
126126
api("org.hamcrest:hamcrest:2.2")
127127
api("org.hibernate:hibernate-core-jakarta:5.6.15.Final")
128128
api("org.hibernate:hibernate-validator:7.0.5.Final")
129129
api("org.hsqldb:hsqldb:2.7.1")
130130
api("org.javamoney:moneta:1.4.2")
131-
api("org.jruby:jruby:9.4.0.0")
131+
api("org.jruby:jruby:9.4.2.0")
132132
api("org.junit.support:testng-engine:1.0.4")
133-
api("org.mozilla:rhino:1.7.11")
133+
api("org.mozilla:rhino:1.7.14")
134134
api("org.ogce:xpp3:1.1.6")
135-
api("org.python:jython-standalone:2.7.1")
135+
api("org.python:jython-standalone:2.7.3")
136136
api("org.quartz-scheduler:quartz:2.3.2")
137137
api("org.seleniumhq.selenium:htmlunit-driver:2.70.0")
138138
api("org.seleniumhq.selenium:selenium-java:3.141.59")
139-
api("org.skyscreamer:jsonassert:1.5.0")
140-
api("org.slf4j:slf4j-api:2.0.6")
139+
api("org.skyscreamer:jsonassert:1.5.1")
140+
api("org.slf4j:slf4j-api:2.0.7")
141141
api("org.testng:testng:7.7.1")
142142
api("org.webjars:underscorejs:1.8.3")
143143
api("org.webjars:webjars-locator-core:0.52")

‎settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pluginManagement {
77
}
88

99
plugins {
10-
id "com.gradle.enterprise" version "3.12.3"
10+
id "com.gradle.enterprise" version "3.12.6"
1111
id "io.spring.ge.conventions" version "0.0.13"
1212
}
1313

‎spring-core/spring-core.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ apply plugin: "kotlin"
77
apply plugin: "kotlinx-serialization"
88

99
def javapoetVersion = "1.13.0"
10-
def objenesisVersion = "3.2"
10+
def objenesisVersion = "3.3"
1111

1212
configurations {
1313
javapoet

‎spring-test/src/test/java/org/springframework/test/context/junit4/nested/NestedTestsWithSpringRulesTests.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2019 the original author or authors.
2+
* Copyright 2002-2023 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -62,13 +62,7 @@ public class NestedTestCase extends SpringRuleConfigurer {
6262

6363
@Test
6464
public void nestedTest() throws Exception {
65-
// Note: the following would fail since TestExecutionListeners in
66-
// the Spring TestContext Framework are not applied to the enclosing
67-
// instance of an inner test class.
68-
//
69-
// assertEquals("foo", foo);
70-
71-
assertThat(foo).as("@Autowired field in enclosing instance should be null.").isNull();
65+
assertThat(foo).isEqualTo("foo");
7266
assertThat(bar).isEqualTo("bar");
7367
}
7468
}

0 commit comments

Comments
 (0)