Skip to content

make findbugs a compileOnly dependency #56

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

Merged
andrewmwells-amazon merged 2 commits into from
Nov 1, 2023
Merged

make findbugs a compileOnly dependency #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
375bcd9
make findbugs a compileOnly dependency
andrewmwells-amazon Nov 1, 2023
66cdeb1
fix config.sh
andrewmwells-amazon Nov 1, 2023
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
4 changes: 3 additions & 1 deletion CedarJava/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions CedarJava/config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down