Skip to content

Commit 45e1925

Browse files
renovate[bot]laurit
renovate[bot]
and
laurit
authored
fix(deps): update junit5 monorepo to v5.11.0 (release/v1.33.x) (minor) (#12011)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin <[email protected]>
1 parent 5da993c commit 45e1925

File tree

16 files changed

+54
-32
lines changed

16 files changed

+54
-32
lines changed

‎benchmark-overhead/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ repositories {
1616
}
1717

1818
dependencies {
19-
implementation(enforcedPlatform("org.junit:junit-bom:5.10.3"))
19+
implementation(enforcedPlatform("org.junit:junit-bom:5.11.0"))
2020

2121
testImplementation("org.testcontainers:testcontainers:1.20.1")
2222
testImplementation("org.testcontainers:postgresql:1.20.1")

‎conventions/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ dependencies {
7070
implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.0.0")
7171
implementation("me.champeau.gradle:japicmp-gradle-plugin:0.4.3")
7272

73-
testImplementation(enforcedPlatform("org.junit:junit-bom:5.10.3"))
73+
testImplementation(enforcedPlatform("org.junit:junit-bom:5.11.0"))
7474
testImplementation("org.junit.jupiter:junit-jupiter-api")
7575
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
7676
testImplementation("org.assertj:assertj-core:3.26.3")

‎dependencyManagement/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ val DEPENDENCY_BOMS = listOf(
3232
"org.apache.groovy:groovy-bom:${groovyVersion}",
3333
"io.opentelemetry:opentelemetry-bom:${otelSdkVersion}",
3434
"io.opentelemetry:opentelemetry-bom-alpha:${otelSdkAlphaVersion}",
35-
"org.junit:junit-bom:5.10.3",
35+
"org.junit:junit-bom:5.11.0",
3636
"org.testcontainers:testcontainers-bom:1.20.1",
3737
"org.spockframework:spock-bom:2.4-M4-groovy-4.0"
3838
)

‎examples/distro/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ subprojects {
3434
opentelemetryJavaagentAlpha: "1.33.5-alpha",
3535

3636
autoservice : "1.1.1",
37-
junit : "5.10.3"
37+
junit : "5.11.0"
3838
]
3939

4040
deps = [

‎examples/extension/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ext {
2929
opentelemetryJavaagent : "1.33.5",
3030
opentelemetryJavaagentAlpha: "1.33.5-alpha",
3131

32-
junit : "5.10.3"
32+
junit : "5.11.0"
3333
]
3434

3535
deps = [

‎gradle-plugins/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ dependencies {
4343

4444
testImplementation("org.assertj:assertj-core:3.26.3")
4545

46-
testImplementation(enforcedPlatform("org.junit:junit-bom:5.10.3"))
46+
testImplementation(enforcedPlatform("org.junit:junit-bom:5.11.0"))
4747
testImplementation("org.junit.jupiter:junit-jupiter-api")
4848
testImplementation("org.junit.jupiter:junit-jupiter-params")
4949
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")

‎instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/s3PresignerTest/java/S3PresignerTest.java ‎instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/s3PresignerTest/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/S3PresignerTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
package io.opentelemetry.javaagent.instrumentation.awssdk.v2_2;
7+
68
import static org.assertj.core.api.Assertions.assertThat;
79

810
import io.opentelemetry.api.trace.Span;

‎instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/test/java/Aws2ClientRecordHttpErrorTest.java ‎instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/Aws2ClientRecordHttpErrorTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
package io.opentelemetry.javaagent.instrumentation.awssdk.v2_2;
7+
68
import io.opentelemetry.instrumentation.awssdk.v2_2.AbstractAws2ClientRecordHttpErrorTest;
79
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
810
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;

‎instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/test/java/QueryProtocolModelTest.java ‎instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/QueryProtocolModelTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
package io.opentelemetry.javaagent.instrumentation.awssdk.v2_2;
7+
68
import io.opentelemetry.instrumentation.awssdk.v2_2.AbstractQueryProtocolModelTest;
79
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
810
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;

‎instrumentation/cassandra/cassandra-4.0/javaagent/src/test/java/CassandraTest.java ‎instrumentation/cassandra/cassandra-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/cassandra/v4_0/CassandraTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
package io.opentelemetry.javaagent.instrumentation.cassandra.v4_0;
7+
68
import io.opentelemetry.cassandra.v4.common.AbstractCassandraTest;
79
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
810
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;

‎instrumentation/quarkus-resteasy-reactive/quarkus2-testing/build.gradle.kts

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ otelJava {
1010

1111
dependencies {
1212
implementation(enforcedPlatform("io.quarkus.platform:quarkus-bom:2.16.7.Final"))
13+
// fails with junit 5.11.+
14+
implementation(enforcedPlatform("org.junit:junit-bom:5.10.3"))
1315
implementation("io.quarkus:quarkus-resteasy-reactive")
1416

1517
testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))

‎instrumentation/quarkus-resteasy-reactive/quarkus3-testing/build.gradle.kts

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ if (findProperty("testLatestDeps") as Boolean) {
1616

1717
dependencies {
1818
implementation(enforcedPlatform("io.quarkus.platform:quarkus-bom:$quarkusVersion"))
19+
// fails with junit 5.11.+
20+
implementation(enforcedPlatform("org.junit:junit-bom:5.10.3"))
1921
implementation("io.quarkus:quarkus-resteasy-reactive")
2022

2123
testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))

‎instrumentation/spring/spring-data/spring-data-1.8/javaagent/src/test/java/SpringJpaTest.java ‎instrumentation/spring/spring-data/spring-data-1.8/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/data/v1_8/SpringJpaTest.java

+13-9
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,40 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
package io.opentelemetry.javaagent.instrumentation.spring.data.v1_8;
7+
8+
import io.opentelemetry.javaagent.instrumentation.spring.data.AbstractSpringJpaTest;
69
import java.util.List;
710
import java.util.Optional;
811
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
912
import spring.jpa.JpaCustomer;
1013
import spring.jpa.JpaCustomerRepository;
1114
import spring.jpa.JpaPersistenceConfig;
1215

13-
public class SpringJpaTest extends AbstractSpringJpaTest<JpaCustomer, JpaCustomerRepository> {
16+
class SpringJpaTest extends AbstractSpringJpaTest<JpaCustomer, JpaCustomerRepository> {
1417

1518
@Override
16-
JpaCustomer newCustomer(String firstName, String lastName) {
19+
protected JpaCustomer newCustomer(String firstName, String lastName) {
1720
return new JpaCustomer(firstName, lastName);
1821
}
1922

2023
@Override
21-
Long id(JpaCustomer customer) {
24+
protected Long id(JpaCustomer customer) {
2225
return customer.getId();
2326
}
2427

2528
@Override
26-
void setFirstName(JpaCustomer customer, String firstName) {
29+
protected void setFirstName(JpaCustomer customer, String firstName) {
2730
customer.setFirstName(firstName);
2831
}
2932

3033
@Override
31-
Class<JpaCustomerRepository> repositoryClass() {
34+
protected Class<JpaCustomerRepository> repositoryClass() {
3235
return JpaCustomerRepository.class;
3336
}
3437

3538
@Override
36-
JpaCustomerRepository repository() {
39+
protected JpaCustomerRepository repository() {
3740
AnnotationConfigApplicationContext context =
3841
new AnnotationConfigApplicationContext(JpaPersistenceConfig.class);
3942
JpaCustomerRepository repo = context.getBean(JpaCustomerRepository.class);
@@ -45,17 +48,18 @@ JpaCustomerRepository repository() {
4548
}
4649

4750
@Override
48-
List<JpaCustomer> findByLastName(JpaCustomerRepository repository, String lastName) {
51+
protected List<JpaCustomer> findByLastName(JpaCustomerRepository repository, String lastName) {
4952
return repository.findByLastName(lastName);
5053
}
5154

5255
@Override
53-
List<JpaCustomer> findSpecialCustomers(JpaCustomerRepository repository) {
56+
protected List<JpaCustomer> findSpecialCustomers(JpaCustomerRepository repository) {
5457
return repository.findSpecialCustomers();
5558
}
5659

5760
@Override
58-
Optional<JpaCustomer> findOneByLastName(JpaCustomerRepository repository, String lastName) {
61+
protected Optional<JpaCustomer> findOneByLastName(
62+
JpaCustomerRepository repository, String lastName) {
5963
return repository.findOneByLastName(lastName);
6064
}
6165
}

‎instrumentation/spring/spring-data/spring-data-3.0/testing/src/test/java/SpringJpaTest.java

+10-8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
import io.opentelemetry.javaagent.instrumentation.spring.data.AbstractSpringJpaTest;
67
import java.util.List;
78
import java.util.Optional;
89
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -13,27 +14,27 @@
1314
public class SpringJpaTest extends AbstractSpringJpaTest<JpaCustomer, JpaCustomerRepository> {
1415

1516
@Override
16-
JpaCustomer newCustomer(String firstName, String lastName) {
17+
protected JpaCustomer newCustomer(String firstName, String lastName) {
1718
return new JpaCustomer(firstName, lastName);
1819
}
1920

2021
@Override
21-
Long id(JpaCustomer customer) {
22+
protected Long id(JpaCustomer customer) {
2223
return customer.getId();
2324
}
2425

2526
@Override
26-
void setFirstName(JpaCustomer customer, String firstName) {
27+
protected void setFirstName(JpaCustomer customer, String firstName) {
2728
customer.setFirstName(firstName);
2829
}
2930

3031
@Override
31-
Class<JpaCustomerRepository> repositoryClass() {
32+
protected Class<JpaCustomerRepository> repositoryClass() {
3233
return JpaCustomerRepository.class;
3334
}
3435

3536
@Override
36-
JpaCustomerRepository repository() {
37+
protected JpaCustomerRepository repository() {
3738
AnnotationConfigApplicationContext context =
3839
new AnnotationConfigApplicationContext(JpaPersistenceConfig.class);
3940
JpaCustomerRepository repo = context.getBean(JpaCustomerRepository.class);
@@ -45,17 +46,18 @@ JpaCustomerRepository repository() {
4546
}
4647

4748
@Override
48-
List<JpaCustomer> findByLastName(JpaCustomerRepository repository, String lastName) {
49+
protected List<JpaCustomer> findByLastName(JpaCustomerRepository repository, String lastName) {
4950
return repository.findByLastName(lastName);
5051
}
5152

5253
@Override
53-
List<JpaCustomer> findSpecialCustomers(JpaCustomerRepository repository) {
54+
protected List<JpaCustomer> findSpecialCustomers(JpaCustomerRepository repository) {
5455
return repository.findSpecialCustomers();
5556
}
5657

5758
@Override
58-
Optional<JpaCustomer> findOneByLastName(JpaCustomerRepository repository, String lastName) {
59+
protected Optional<JpaCustomer> findOneByLastName(
60+
JpaCustomerRepository repository, String lastName) {
5961
return repository.findOneByLastName(lastName);
6062
}
6163
}

‎instrumentation/spring/spring-data/spring-data-common/testing/src/main/java/AbstractSpringJpaTest.java ‎instrumentation/spring/spring-data/spring-data-common/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/data/AbstractSpringJpaTest.java

+11-9
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
package io.opentelemetry.javaagent.instrumentation.spring.data;
7+
68
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
79
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.satisfies;
810
import static org.assertj.core.api.Assertions.catchThrowableOfType;
@@ -32,23 +34,23 @@ public abstract class AbstractSpringJpaTest<
3234
@RegisterExtension
3335
private static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
3436

35-
abstract ENTITY newCustomer(String firstName, String lastName);
37+
protected abstract ENTITY newCustomer(String firstName, String lastName);
3638

37-
abstract Long id(ENTITY customer);
39+
protected abstract Long id(ENTITY customer);
3840

39-
abstract void setFirstName(ENTITY customer, String firstName);
41+
protected abstract void setFirstName(ENTITY customer, String firstName);
4042

41-
abstract Class<REPOSITORY> repositoryClass();
43+
protected abstract Class<REPOSITORY> repositoryClass();
4244

43-
abstract REPOSITORY repository();
45+
protected abstract REPOSITORY repository();
4446

45-
abstract List<ENTITY> findByLastName(REPOSITORY repository, String lastName);
47+
protected abstract List<ENTITY> findByLastName(REPOSITORY repository, String lastName);
4648

47-
abstract List<ENTITY> findSpecialCustomers(REPOSITORY repository);
49+
protected abstract List<ENTITY> findSpecialCustomers(REPOSITORY repository);
4850

49-
abstract Optional<ENTITY> findOneByLastName(REPOSITORY repository, String lastName);
51+
protected abstract Optional<ENTITY> findOneByLastName(REPOSITORY repository, String lastName);
5052

51-
void clearData() {
53+
protected void clearData() {
5254
testing.clearData();
5355
}
5456

‎instrumentation/tapestry-5.4/javaagent/src/test/java/TapestryTest.java ‎instrumentation/tapestry-5.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/tapestry/TapestryTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
package io.opentelemetry.javaagent.instrumentation.tapestry;
7+
68
import static org.assertj.core.api.Assertions.assertThat;
79

810
import io.opentelemetry.api.trace.SpanKind;

0 commit comments

Comments
 (0)