Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump io.avaje:junit and bytebuddy version to support JDK 22+ #3255

Merged
merged 1 commit into from
Oct 25, 2023
Merged

Bump io.avaje:junit and bytebuddy version to support JDK 22+ #3255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions ebean-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 0 additions & 7 deletions ebean-core-type/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
7 changes: 0 additions & 7 deletions ebean-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ebean-core/src/test/java/io/ebeaninternal/server/profile/BasicProfileLocationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand Down
7 changes: 0 additions & 7 deletions ebean-ddl-generator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 0 additions & 7 deletions ebean-jackson-mapper/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
7 changes: 0 additions & 7 deletions ebean-postgis-types/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 0 additions & 7 deletions ebean-querybean/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 0 additions & 7 deletions ebean-redis/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 0 additions & 7 deletions ebean-spring-txn/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
28 changes: 19 additions & 9 deletions ebean-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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+ -->
Expand Down Expand Up @@ -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>

Expand Down
8 changes: 0 additions & 8 deletions kotlin-querybean-generator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 0 additions & 7 deletions platforms/h2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
7 changes: 0 additions & 7 deletions platforms/hana/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
7 changes: 0 additions & 7 deletions platforms/mysql/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
7 changes: 0 additions & 7 deletions platforms/oracle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
7 changes: 0 additions & 7 deletions platforms/postgres/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
7 changes: 0 additions & 7 deletions platforms/sqlserver/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
7 changes: 7 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
11 changes: 0 additions & 11 deletions querybean-generator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 0 additions & 7 deletions tests/test-java16/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion tests/test-kotlin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<dependency>
<groupId>io.avaje</groupId>
<artifactId>junit</artifactId>
<version>1.1</version>
<version>1.3</version>
<scope>test</scope>
</dependency>

Expand Down