From 375bcd96921078e84cb09fefa09926ec032bcc98 Mon Sep 17 00:00:00 2001 From: Andrew Wells Date: Wed, 1 Nov 2023 14:39:20 -0700 Subject: [PATCH 1/2] make findbugs a compileOnly dependency --- CedarJava/build.gradle | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CedarJava/build.gradle b/CedarJava/build.gradle index ff50e183..b1c7576b 100644 --- a/CedarJava/build.gradle +++ b/CedarJava/build.gradle @@ -71,11 +71,13 @@ dependencies { implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.15.0' implementation 'org.slf4j:slf4j-api:2.0.7' implementation 'org.apache.commons:commons-text:1.10.0' - implementation 'com.google.code.findbugs:findbugs:3.0.1' implementation 'org.apache.logging.log4j:log4j-core:2.20.0' implementation 'org.apache.logging.log4j:log4j-to-slf4j:2.20.0' implementation 'com.google.guava:guava:31.0.1-jre' + compileOnly 'com.google.code.findbugs:findbugs:3.0.1' + testCompileOnly 'com.google.code.findbugs:findbugs:3.0.1' + testImplementation 'org.junit.jupiter:junit-jupiter-params:5.9.3' testImplementation 'org.junit.jupiter:junit-jupiter-engine:5.9.3' testImplementation 'org.mockito:mockito-inline:5.2.0' From 66cdeb1cbe6fccbdc0d7daa248ee18a29baebc2d Mon Sep 17 00:00:00 2001 From: Andrew Wells Date: Wed, 1 Nov 2023 14:45:25 -0700 Subject: [PATCH 2/2] fix config.sh --- CedarJava/config.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CedarJava/config.sh b/CedarJava/config.sh index 39337601..e25f943f 100644 --- a/CedarJava/config.sh +++ b/CedarJava/config.sh @@ -14,7 +14,7 @@ if [ "$(uname)" == "Darwin" ]; then else ffi_lib_str=" environment 'CEDAR_JAVA_FFI_LIB', '"$parent_dir"/CedarJavaFFI/target/debug/libcedar_java_ffi.so'" fi -sed "89s;.*;$ffi_lib_str;" "build.gradle" > new_build.gradle +sed "91s;.*;$ffi_lib_str;" "build.gradle" > new_build.gradle mv new_build.gradle build.gradle # In CI, we need to pull the latest cedar-policy to match the latest cedar-integration-tests @@ -23,7 +23,7 @@ mv new_build.gradle build.gradle # If you call this script with `run_int_tests`, we assume you have `cedar` checkout out in the `cedar-java` dir if [ "$#" -ne 0 ] && [ "$1" == "run_int_tests" ]; then integration_tests_str=" environment 'CEDAR_INTEGRATION_TESTS_ROOT', '"$parent_dir"/cedar/cedar-integration-tests'" - sed "88s;.*;$integration_tests_str;" "build.gradle" > new_build.gradle + sed "90s;.*;$integration_tests_str;" "build.gradle" > new_build.gradle mv new_build.gradle build.gradle export MUST_RUN_CEDAR_INTEGRATION_TESTS=1