Merge pull request #3255 from ebean-orm/feature/bump-junit-bytebuddy

Bump io.avaje:junit and bytebuddy version to support JDK 22+
ebean-orm · Oct 25, 2023 · 9f65673 · 9f65673
2 parents 05210ec + 8f6a3c5
commit 9f65673
Show file tree

Hide file tree

Showing 22 changed files with 28 additions and 142 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>junit</artifactId>
-      <version>1.1</version>
+      <version>1.3</version>
       <scope>test</scope>
     </dependency>