bumps version, gradle fixes, updates config.sh, updates CI workflow

Signed-off-by: Mudit Chaudhary <chmudit@amazon.com>

Author: muditchaudhary

.github/workflows/ci.yml

@@ -10,10 +10,6 @@ jobs:
   build_and_test_cedar_java_ffi:
     name: Rust project - latest
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        toolchain:
-          - stable
     steps:
       - name: Checkout Cedar Examples
         uses: actions/checkout@v3
@@ -24,7 +20,7 @@ jobs:
           ref: release/2.3.x
           path: ./cedar
       - name: rustup
-        run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }}
+        run: rustup update 1.75.0 && rustup default 1.75.0 && rustup component add rustfmt
       - name: cargo fmt
         working-directory: ./CedarJavaFFI
         run: cargo fmt --all --check

CedarJava/build.gradle

@@ -28,6 +28,9 @@ plugins {
     id 'signing'
 }
 
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
+
 /*
  Applies community Gradle plugins, usually added as build-tools in Config.
 */
@@ -38,11 +41,18 @@ apply plugin: 'com.github.spotbugs'
 
 apply plugin: 'org.owasp.dependencycheck'
 
-check.dependsOn dependencyCheckAnalyze
+if (System.getenv('NVD_API_KEY')) {
+    check.dependsOn dependencyCheckAnalyze
+}
 dependencyCheck {
     format='HTML'
     failBuildOnCVSS=7
     suppressionFile='suppressions.xml'
+    if (System.getenv('NVD_API_KEY')) {
+        nvd {
+            apiKey = System.getenv('NVD_API_KEY')
+        }
+    }
 }
 
 /*
@@ -97,8 +107,8 @@ dependencies {
 
 test {
     useJUnitPlatform()
-    //environment "CEDAR_INTEGRATION_TESTS_ROOT", ''set to absolute path of `cedar-integration-tests`'
-    //environment 'CEDAR_JAVA_FFI_LIB', 'set to absolute path of cedar_java_ffi native library (including file extension)'
+    environment 'CEDAR_INTEGRATION_TESTS_ROOT', '/Users/chmudit/cedar-java-3_4_1/mudit-fork/cedar-java/cedar/cedar-integration-tests'
+    environment 'CEDAR_JAVA_FFI_LIB', '/Users/chmudit/cedar-java-3_4_1/mudit-fork/cedar-java/CedarJavaFFI/target/debug/libcedar_java_ffi.dylib'
     testLogging {
         showStandardStreams false
         exceptionFormat 'full'
@@ -116,7 +126,7 @@ publishing {
             from components.java
             groupId = 'com.cedarpolicy'
             artifactId = 'cedar-java'
-            version = '2.3.3'
+            version = '2.3.6'
             pom {
                 name = 'CedarJava'
                 description = 'Java bindings for Cedar policy language.'

CedarJava/config.sh

@@ -14,17 +14,15 @@ if [ "$(uname)" == "Darwin" ]; then
 else
     ffi_lib_str="    environment 'CEDAR_JAVA_FFI_LIB', '"$parent_dir"/CedarJavaFFI/target/debug/libcedar_java_ffi.so'"
 fi
-sed "101s;.*;$ffi_lib_str;" "build.gradle" > new_build.gradle
-mv new_build.gradle build.gradle
+sed -i.bak "s|.*environment 'CEDAR_JAVA_FFI_LIB'.*|$ffi_lib_str|" "build.gradle" && rm -f build.gradle.bak
 
 # In CI, we need to pull the latest cedar-policy to match the latest cedar-integration-tests
 # We require that integration tests be run
 # Outside of CI, we can skip the integration tests (run script with no args)
 # 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 "100s;.*;$integration_tests_str;" "build.gradle" > new_build.gradle
-    mv new_build.gradle build.gradle
+    sed -i.bak "s|.*environment.*CEDAR_INTEGRATION_TESTS_ROOT.*|$integration_tests_str|" "build.gradle" && rm -f build.gradle.bak
 
     export MUST_RUN_CEDAR_INTEGRATION_TESTS=1