From 8f6a3c59d11e45fbdec1bc406806a04ac942f4c3 Mon Sep 17 00:00:00 2001 From: Rob Bygrave Date: Wed, 25 Oct 2023 21:58:19 +1300 Subject: [PATCH] Bump io.avaje:junit and bytebuddy version to support JDK 22+ --- ebean-api/pom.xml | 7 ----- ebean-core-type/pom.xml | 7 ----- ebean-core/pom.xml | 7 ----- .../profile/BasicProfileLocationTest.java | 2 +- ebean-ddl-generator/pom.xml | 7 ----- ebean-jackson-mapper/pom.xml | 7 ----- ebean-postgis-types/pom.xml | 7 ----- ebean-querybean/pom.xml | 7 ----- ebean-redis/pom.xml | 7 ----- ebean-spring-txn/pom.xml | 7 ----- ebean-test/pom.xml | 28 +++++++++++++------ kotlin-querybean-generator/pom.xml | 8 ------ platforms/h2/pom.xml | 7 ----- platforms/hana/pom.xml | 7 ----- platforms/mysql/pom.xml | 7 ----- platforms/oracle/pom.xml | 7 ----- platforms/postgres/pom.xml | 7 ----- platforms/sqlserver/pom.xml | 7 ----- pom.xml | 7 +++++ querybean-generator/pom.xml | 11 -------- tests/test-java16/pom.xml | 7 ----- tests/test-kotlin/pom.xml | 2 +- 22 files changed, 28 insertions(+), 142 deletions(-) diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index 356b1504c..979a566c3 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -107,13 +107,6 @@ - - io.avaje - junit - 1.1 - test - - diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 6c40e493b..d245cc00c 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -34,13 +34,6 @@ true - - io.avaje - junit - 1.1 - test - - diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index c6d7d2ad1..deb3369d5 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -184,13 +184,6 @@ test - - io.avaje - junit - 1.1 - test - - diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java index c7ab83034..71171930d 100644 --- a/ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java +++ b/ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java @@ -55,7 +55,7 @@ class BasicProfileLocationTest { DProfileLocation loc = new DTimedProfileLocation("foo", MetricFactory.get().createTimedMetric("junk")); assertThat(loc.obtain()).isTrue(); - assertThat(loc.fullLocation()).endsWith("org.junit.platform.commons.util.ReflectionUtils.invokeMethod(ReflectionUtils.java:725)"); + assertThat(loc.fullLocation()).endsWith("org.junit.platform.commons.util.ReflectionUtils.invokeMethod(ReflectionUtils.java:728)"); assertThat(loc.location()).isEqualTo("org.junit.platform.commons.util.ReflectionUtils.invokeMethod"); assertThat(loc.label()).isEqualTo("ReflectionUtils.invokeMethod"); } diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml index f910b1379..85a4ab92f 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -62,13 +62,6 @@ - - io.avaje - junit - 1.1 - test - - io.ebean ebean-platform-all diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 10547f102..7006d7d03 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -30,13 +30,6 @@ ${jackson.version} - - io.avaje - junit - 1.1 - test - - diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index 47f23c844..494025787 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -73,13 +73,6 @@ test - - io.avaje - junit - 1.1 - test - - diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 291d1720a..2c3d817d9 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -74,13 +74,6 @@ test - - io.avaje - junit - 1.1 - test - - org.avaje.composite logback diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index d6cb99eac..d64e0cb00 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -47,13 +47,6 @@ test - - io.avaje - junit - 1.1 - test - - org.avaje.composite logback diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 4eecae420..17b8a2206 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -81,13 +81,6 @@ test - - io.avaje - junit - 1.1 - test - - org.slf4j jcl-over-slf4j diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 79e48ba2b..a3c3f133e 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -11,6 +11,11 @@ Testing support for Ebean ebean-test + + 1.14.9 + 3.24.2 + + @@ -64,10 +69,22 @@ ${ebean-test-containers.version} + + + net.bytebuddy + byte-buddy + ${bytebuddy.version} + + + net.bytebuddy + byte-buddy-agent + ${bytebuddy.version} + + org.assertj assertj-core - 3.23.1 + ${assertj.version} @@ -272,18 +289,11 @@ test - - ch.qos.logback - logback-classic - 1.2.11 - test - - io.avaje junit - 1.1 + 1.3 provided diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 7750c2ef5..19f150c3e 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -18,14 +18,6 @@ - - - io.avaje - junit - 1.1 - test - - io.ebean ebean-querybean diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 8319c8fda..46159bf54 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -27,12 +27,5 @@ true - - io.avaje - junit - 1.1 - test - - diff --git a/platforms/hana/pom.xml b/platforms/hana/pom.xml index 2a90a4aa2..90b4966c8 100644 --- a/platforms/hana/pom.xml +++ b/platforms/hana/pom.xml @@ -18,12 +18,5 @@ 13.23.1-jakarta - - io.avaje - junit - 1.1 - test - - diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml index 311804361..77dd69f82 100644 --- a/platforms/mysql/pom.xml +++ b/platforms/mysql/pom.xml @@ -18,12 +18,5 @@ 13.23.1-jakarta - - io.avaje - junit - 1.1 - test - - diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml index 12718c9f0..a8fce7584 100644 --- a/platforms/oracle/pom.xml +++ b/platforms/oracle/pom.xml @@ -18,12 +18,5 @@ 13.23.1-jakarta - - io.avaje - junit - 1.1 - test - - diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml index 38152d269..8e5f03373 100644 --- a/platforms/postgres/pom.xml +++ b/platforms/postgres/pom.xml @@ -32,12 +32,5 @@ test - - io.avaje - junit - 1.1 - test - - diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml index 868c1a26d..966566425 100644 --- a/platforms/sqlserver/pom.xml +++ b/platforms/sqlserver/pom.xml @@ -18,12 +18,5 @@ 13.23.1-jakarta - - io.avaje - junit - 1.1 - test - - diff --git a/pom.xml b/pom.xml index 797647640..6763efd9d 100644 --- a/pom.xml +++ b/pom.xml @@ -60,6 +60,13 @@ + + io.avaje + junit + 1.3 + test + + ch.qos.logback logback-classic diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml index eacc56557..6cc254705 100644 --- a/querybean-generator/pom.xml +++ b/querybean-generator/pom.xml @@ -11,17 +11,6 @@ Querybean generator querybean-generator - - - - io.avaje - junit - 1.1 - test - - - - diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml index 958fcb271..b0bf37dd8 100644 --- a/tests/test-java16/pom.xml +++ b/tests/test-java16/pom.xml @@ -34,13 +34,6 @@ test - - io.avaje - junit - 1.1 - test - - io.ebean querybean-generator diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml index 4f1f19680..f681173ed 100644 --- a/tests/test-kotlin/pom.xml +++ b/tests/test-kotlin/pom.xml @@ -46,7 +46,7 @@ io.avaje junit - 1.1 + 1.3 test