diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml index 356b1504c8..979a566c3f 100644 --- a/ebean-api/pom.xml +++ b/ebean-api/pom.xml @@ -107,13 +107,6 @@ </dependency> <!-- JAKARTA-DEPENDENCY-END --> - <dependency> - <groupId>io.avaje</groupId> - <artifactId>junit</artifactId> - <version>1.1</version> - <scope>test</scope> - </dependency> - </dependencies> <build> diff --git a/ebean-core-type/pom.xml b/ebean-core-type/pom.xml index 6c40e493b6..d245cc00cb 100644 --- a/ebean-core-type/pom.xml +++ b/ebean-core-type/pom.xml @@ -34,13 +34,6 @@ <optional>true</optional> </dependency> - <dependency> - <groupId>io.avaje</groupId> - <artifactId>junit</artifactId> - <version>1.1</version> - <scope>test</scope> - </dependency> - </dependencies> </project> diff --git a/ebean-core/pom.xml b/ebean-core/pom.xml index c6d7d2ad15..deb3369d50 100644 --- a/ebean-core/pom.xml +++ b/ebean-core/pom.xml @@ -184,13 +184,6 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>io.avaje</groupId> - <artifactId>junit</artifactId> - <version>1.1</version> - <scope>test</scope> - </dependency> - </dependencies> <build> 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 c7ab830345..71171930d3 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 @@ void obtain() { 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 f910b13799..85a4ab92f8 100644 --- a/ebean-ddl-generator/pom.xml +++ b/ebean-ddl-generator/pom.xml @@ -62,13 +62,6 @@ <!-- JAKARTA-DEPENDENCY-END --> <!-- test dependencies --> - <dependency> - <groupId>io.avaje</groupId> - <artifactId>junit</artifactId> - <version>1.1</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>io.ebean</groupId> <artifactId>ebean-platform-all</artifactId> diff --git a/ebean-jackson-mapper/pom.xml b/ebean-jackson-mapper/pom.xml index 10547f1027..7006d7d03a 100644 --- a/ebean-jackson-mapper/pom.xml +++ b/ebean-jackson-mapper/pom.xml @@ -30,13 +30,6 @@ <version>${jackson.version}</version> </dependency> - <dependency> - <groupId>io.avaje</groupId> - <artifactId>junit</artifactId> - <version>1.1</version> - <scope>test</scope> - </dependency> - </dependencies> </project> diff --git a/ebean-postgis-types/pom.xml b/ebean-postgis-types/pom.xml index 47f23c8444..494025787c 100644 --- a/ebean-postgis-types/pom.xml +++ b/ebean-postgis-types/pom.xml @@ -73,13 +73,6 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>io.avaje</groupId> - <artifactId>junit</artifactId> - <version>1.1</version> - <scope>test</scope> - </dependency> - </dependencies> <build> diff --git a/ebean-querybean/pom.xml b/ebean-querybean/pom.xml index 291d1720af..2c3d817d9c 100644 --- a/ebean-querybean/pom.xml +++ b/ebean-querybean/pom.xml @@ -74,13 +74,6 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>io.avaje</groupId> - <artifactId>junit</artifactId> - <version>1.1</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.avaje.composite</groupId> <artifactId>logback</artifactId> diff --git a/ebean-redis/pom.xml b/ebean-redis/pom.xml index d6cb99eacd..d64e0cb004 100644 --- a/ebean-redis/pom.xml +++ b/ebean-redis/pom.xml @@ -47,13 +47,6 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>io.avaje</groupId> - <artifactId>junit</artifactId> - <version>1.1</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.avaje.composite</groupId> <artifactId>logback</artifactId> diff --git a/ebean-spring-txn/pom.xml b/ebean-spring-txn/pom.xml index 4eecae420c..17b8a22066 100644 --- a/ebean-spring-txn/pom.xml +++ b/ebean-spring-txn/pom.xml @@ -81,13 +81,6 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>io.avaje</groupId> - <artifactId>junit</artifactId> - <version>1.1</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>jcl-over-slf4j</artifactId> diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml index 79e48ba2b9..a3c3f133e4 100644 --- a/ebean-test/pom.xml +++ b/ebean-test/pom.xml @@ -11,6 +11,11 @@ <description>Testing support for Ebean</description> <artifactId>ebean-test</artifactId> + <properties> + <bytebuddy.version>1.14.9</bytebuddy.version> + <assertj.version>3.24.2</assertj.version> + </properties> + <dependencies> <dependency> @@ -64,10 +69,22 @@ <version>${ebean-test-containers.version}</version> </dependency> + <!-- support JDK 22+ --> + <dependency> + <groupId>net.bytebuddy</groupId> + <artifactId>byte-buddy</artifactId> + <version>${bytebuddy.version}</version> + </dependency> + <dependency> + <groupId>net.bytebuddy</groupId> + <artifactId>byte-buddy-agent</artifactId> + <version>${bytebuddy.version}</version> + </dependency> + <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> - <version>3.23.1</version> + <version>${assertj.version}</version> </dependency> <!-- Including JAXB for DB Migration generation with Java 11+ --> @@ -272,18 +289,11 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <version>1.2.11</version> - <scope>test</scope> - </dependency> - <!-- provided scope for Java 11 compilation (not required for Java 17+) --> <dependency> <groupId>io.avaje</groupId> <artifactId>junit</artifactId> - <version>1.1</version> + <version>1.3</version> <scope>provided</scope> </dependency> diff --git a/kotlin-querybean-generator/pom.xml b/kotlin-querybean-generator/pom.xml index 7750c2ef55..19f150c3e6 100644 --- a/kotlin-querybean-generator/pom.xml +++ b/kotlin-querybean-generator/pom.xml @@ -18,14 +18,6 @@ <dependencies> <!-- test dependencies --> - - <dependency> - <groupId>io.avaje</groupId> - <artifactId>junit</artifactId> - <version>1.1</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>io.ebean</groupId> <artifactId>ebean-querybean</artifactId> diff --git a/platforms/h2/pom.xml b/platforms/h2/pom.xml index 8319c8fdae..46159bf54f 100644 --- a/platforms/h2/pom.xml +++ b/platforms/h2/pom.xml @@ -27,12 +27,5 @@ <optional>true</optional> </dependency> - <dependency> - <groupId>io.avaje</groupId> - <artifactId>junit</artifactId> - <version>1.1</version> - <scope>test</scope> - </dependency> - </dependencies> </project> diff --git a/platforms/hana/pom.xml b/platforms/hana/pom.xml index 2a90a4aa23..90b4966c8b 100644 --- a/platforms/hana/pom.xml +++ b/platforms/hana/pom.xml @@ -18,12 +18,5 @@ <version>13.23.1-jakarta</version> </dependency> - <dependency> - <groupId>io.avaje</groupId> - <artifactId>junit</artifactId> - <version>1.1</version> - <scope>test</scope> - </dependency> - </dependencies> </project> diff --git a/platforms/mysql/pom.xml b/platforms/mysql/pom.xml index 311804361a..77dd69f82d 100644 --- a/platforms/mysql/pom.xml +++ b/platforms/mysql/pom.xml @@ -18,12 +18,5 @@ <version>13.23.1-jakarta</version> </dependency> - <dependency> - <groupId>io.avaje</groupId> - <artifactId>junit</artifactId> - <version>1.1</version> - <scope>test</scope> - </dependency> - </dependencies> </project> diff --git a/platforms/oracle/pom.xml b/platforms/oracle/pom.xml index 12718c9f03..a8fce75846 100644 --- a/platforms/oracle/pom.xml +++ b/platforms/oracle/pom.xml @@ -18,12 +18,5 @@ <version>13.23.1-jakarta</version> </dependency> - <dependency> - <groupId>io.avaje</groupId> - <artifactId>junit</artifactId> - <version>1.1</version> - <scope>test</scope> - </dependency> - </dependencies> </project> diff --git a/platforms/postgres/pom.xml b/platforms/postgres/pom.xml index 38152d2693..8e5f03373e 100644 --- a/platforms/postgres/pom.xml +++ b/platforms/postgres/pom.xml @@ -32,12 +32,5 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>io.avaje</groupId> - <artifactId>junit</artifactId> - <version>1.1</version> - <scope>test</scope> - </dependency> - </dependencies> </project> diff --git a/platforms/sqlserver/pom.xml b/platforms/sqlserver/pom.xml index 868c1a26d6..966566425f 100644 --- a/platforms/sqlserver/pom.xml +++ b/platforms/sqlserver/pom.xml @@ -18,12 +18,5 @@ <version>13.23.1-jakarta</version> </dependency> - <dependency> - <groupId>io.avaje</groupId> - <artifactId>junit</artifactId> - <version>1.1</version> - <scope>test</scope> - </dependency> - </dependencies> </project> diff --git a/pom.xml b/pom.xml index 797647640f..6763efd9db 100644 --- a/pom.xml +++ b/pom.xml @@ -60,6 +60,13 @@ <dependencies> + <dependency> + <groupId>io.avaje</groupId> + <artifactId>junit</artifactId> + <version>1.3</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> diff --git a/querybean-generator/pom.xml b/querybean-generator/pom.xml index eacc565570..6cc2547055 100644 --- a/querybean-generator/pom.xml +++ b/querybean-generator/pom.xml @@ -11,17 +11,6 @@ <description>Querybean generator</description> <artifactId>querybean-generator</artifactId> - <dependencies> - - <dependency> - <groupId>io.avaje</groupId> - <artifactId>junit</artifactId> - <version>1.1</version> - <scope>test</scope> - </dependency> - - </dependencies> - <build> <plugins> <plugin> diff --git a/tests/test-java16/pom.xml b/tests/test-java16/pom.xml index 958fcb2713..b0bf37dd8e 100644 --- a/tests/test-java16/pom.xml +++ b/tests/test-java16/pom.xml @@ -34,13 +34,6 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>io.avaje</groupId> - <artifactId>junit</artifactId> - <version>1.1</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>io.ebean</groupId> <artifactId>querybean-generator</artifactId> diff --git a/tests/test-kotlin/pom.xml b/tests/test-kotlin/pom.xml index 4f1f196809..f681173ed0 100644 --- a/tests/test-kotlin/pom.xml +++ b/tests/test-kotlin/pom.xml @@ -46,7 +46,7 @@ <dependency> <groupId>io.avaje</groupId> <artifactId>junit</artifactId> - <version>1.1</version> + <version>1.3</version> <scope>test</scope> </dependency>