From 5fa2a74f2e417b4bcf72676b13b4fdadb84c70f7 Mon Sep 17 00:00:00 2001 From: Tim van der Lippe Date: Wed, 19 Aug 2020 15:50:13 +0100 Subject: [PATCH] Revert "Update objenesis to 3.1 (#1998)" This reverts commit 32684d1acd6df8f1d143827a16ef5de5e4dc4d6a. --- gradle/dependencies.gradle | 3 ++- gradle/mockito-core/osgi.gradle | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 9ae3679927..d089c4d73d 100644 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -25,7 +25,8 @@ libraries.errorproneTestApi = "com.google.errorprone:error_prone_test_helpers:${ libraries.autoservice = "com.google.auto.service:auto-service:1.0-rc5" -libraries.objenesis = 'org.objenesis:objenesis:3.1' +// objenesis 3.x with full Java 11 support requires Java 8, bump version when Java 7 support is dropped +libraries.objenesis = 'org.objenesis:objenesis:2.6' libraries.asm = 'org.ow2.asm:asm:7.0' diff --git a/gradle/mockito-core/osgi.gradle b/gradle/mockito-core/osgi.gradle index a18942589d..41f1902b45 100644 --- a/gradle/mockito-core/osgi.gradle +++ b/gradle/mockito-core/osgi.gradle @@ -22,7 +22,7 @@ jar { 'junit.*;resolution:=optional', 'org.junit.*;resolution:=optional', 'org.hamcrest;resolution:=optional', - 'org.objenesis;version="[3.1,4.0)"', + 'org.objenesis;version="[2.5,3.0)"', 'org.opentest4j.*;resolution:=optional', 'org.mockito.*' ].join(','),