From 3ecc2ff0698367a2e099bf1de9f5decc1ea9c5e3 Mon Sep 17 00:00:00 2001 From: Mark Roberts Date: Thu, 30 Nov 2023 17:15:31 -0800 Subject: [PATCH] Update Mockito project for Java 11 (#543) --- framework/core/Project/Mockito.pm | 7 +++++++ framework/projects/Mockito/Mockito.build.xml | 4 ++-- framework/test/test_verify_bugs.sh | 12 ++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/framework/core/Project/Mockito.pm b/framework/core/Project/Mockito.pm index ac901f12b..6b9bed55e 100644 --- a/framework/core/Project/Mockito.pm +++ b/framework/core/Project/Mockito.pm @@ -70,6 +70,13 @@ sub _post_checkout { or confess("Couldn't apply patch ($mockito_junit_runner_patch_file): $!"); } + # only bid with release notes and doesn't compile with newer Gradle + if ($vid == 21) { + system("rm -rf $work_dir/buildSrc/src/main/groovy/org/mockito/release/notes"); + system("rm -rf $work_dir/buildSrc/src/test/groovy/org/mockito/release/notes"); + system("sed -i '/apply.from:..gradle.release.gradle./d' $work_dir/build.gradle"); + } + # Change Url to Gradle distribution my $prop = "$work_dir/gradle/wrapper/gradle-wrapper.properties"; my $lib_dir = "$BUILD_SYSTEMS_LIB_DIR/gradle/dists"; diff --git a/framework/projects/Mockito/Mockito.build.xml b/framework/projects/Mockito/Mockito.build.xml index 4ae122826..a8a1656f0 100644 --- a/framework/projects/Mockito/Mockito.build.xml +++ b/framework/projects/Mockito/Mockito.build.xml @@ -21,10 +21,10 @@ - + - + diff --git a/framework/test/test_verify_bugs.sh b/framework/test/test_verify_bugs.sh index a1c62913b..f72ad9089 100755 --- a/framework/test/test_verify_bugs.sh +++ b/framework/test/test_verify_bugs.sh @@ -157,7 +157,19 @@ for bid in $(echo $BUGS); do Math) sed_cmd "s/value=\"1\.[1-5]\"/value=\"1.6\"/" $work_dir/build.xml ;; + Mockito) + # some bids use gradle + sed_cmd "s/sourceCompatibility = 1\.[1-5]/sourceCompatibility=1.6/" $work_dir/build.gradle + sed_cmd "s/targetCompatibility = 1\.[1-5]/targetCompatibility=1.6/" $work_dir/build.gradle + sed_cmd "s/gradle-1.12-bin/gradle-4.9-bin/" $work_dir/gradle/wrapper/gradle-wrapper.properties + sed_cmd "s/gradle-2.2.1-all/gradle-4.9-bin/" $work_dir/gradle/wrapper/gradle-wrapper.properties + sed_cmd "s/0.7-groovy-1.8/1.1-groovy-2.4/" $work_dir/buildSrc/build.gradle + # and some bids don't + sed_cmd "s/source=\"1\.[1-5]\"/source=\"1.6\"/" $work_dir/build.xml + sed_cmd "s/target=\"1\.[1-5]\"/target=\"1.6\"/" $work_dir/build.xml + ;; esac + defects4j compile -w "$work_dir" || die "compile: $PID-$vid" defects4j test $TEST_FLAG -w "$work_dir" || die "run relevant tests: $PID-$vid"