diff --git a/src/ad/build.gradle b/src/ad/build.gradle index 12c2599c..1998bf62 100644 --- a/src/ad/build.gradle +++ b/src/ad/build.gradle @@ -3,11 +3,11 @@ plugins { - id 'com.google.protobuf' version '0.9.6' + id 'com.google.protobuf' version '0.10.0' id 'com.github.sherter.google-java-format' version '0.9' id 'idea' id 'application' - id 'com.github.ben-manes.versions' version '0.53.0' + id 'com.github.ben-manes.versions' version '0.54.0' } repositories { @@ -19,11 +19,11 @@ description = 'Ad Service' group = "ad" version = "0.1.0-SNAPSHOT" -def opentelemetryVersion = "1.60.1" -def opentelemetryInstrumentationVersion = "2.25.0" -def grpcVersion = "1.79.0" -def jacksonVersion = "2.21.1" -def protocVersion = "4.34.0" +def opentelemetryVersion = "1.61.0" +def opentelemetryInstrumentationVersion = "2.27.0" +def grpcVersion = "1.81.0" +def jacksonVersion = "2.21.3" +def protocVersion = "4.34.1" tasks.withType(JavaCompile).configureEach { sourceCompatibility = JavaVersion.VERSION_21 @@ -43,7 +43,7 @@ dependencies { implementation platform("io.opentelemetry:opentelemetry-bom:${opentelemetryVersion}") implementation platform("io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:${opentelemetryInstrumentationVersion}") - implementation "com.google.api.grpc:proto-google-common-protos:2.66.0", + implementation "com.google.api.grpc:proto-google-common-protos:2.70.0", "com.google.protobuf:protobuf-java:${protocVersion}", "javax.annotation:javax.annotation-api:1.3.2", "io.grpc:grpc-protobuf:${grpcVersion}", @@ -53,13 +53,13 @@ dependencies { "io.opentelemetry:opentelemetry-api", "io.opentelemetry:opentelemetry-sdk", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations", - "org.apache.logging.log4j:log4j-core:2.25.3", - "dev.openfeature.contrib.providers:flagd:0.11.20", - 'dev.openfeature:sdk:1.20.1' + "org.apache.logging.log4j:log4j-core:2.25.4", + "dev.openfeature.contrib.providers:flagd:0.13.1", + 'dev.openfeature:sdk:1.20.2' runtimeOnly "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}", "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}", - "io.netty:netty-tcnative-boringssl-static:2.0.75.Final" + "io.netty:netty-tcnative-boringssl-static:2.0.77.Final" } } diff --git a/src/ad/gradle/wrapper/gradle-wrapper.jar b/src/ad/gradle/wrapper/gradle-wrapper.jar index d997cfc6..b1b8ef56 100644 Binary files a/src/ad/gradle/wrapper/gradle-wrapper.jar and b/src/ad/gradle/wrapper/gradle-wrapper.jar differ diff --git a/src/ad/gradle/wrapper/gradle-wrapper.properties b/src/ad/gradle/wrapper/gradle-wrapper.properties index dbc3ce4a..b52fb7e7 100644 --- a/src/ad/gradle/wrapper/gradle-wrapper.properties +++ b/src/ad/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,9 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip networkTimeout=10000 +retries=0 +retryBackOffMs=500 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/ad/gradlew b/src/ad/gradlew index 0262dcbd..b9bb139f 100755 --- a/src/ad/gradlew +++ b/src/ad/gradlew @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/src/ad/gradlew.bat b/src/ad/gradlew.bat index e509b2dd..aa5f10b0 100644 --- a/src/ad/gradlew.bat +++ b/src/ad/gradlew.bat @@ -23,8 +23,8 @@ @rem @rem ########################################################################## -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. @@ -51,7 +51,7 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -65,7 +65,7 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :execute @rem Setup the command line @@ -73,21 +73,10 @@ goto fail @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/src/fraud-detection/build.gradle.kts b/src/fraud-detection/build.gradle.kts index 4a48afa5..bbd88332 100644 --- a/src/fraud-detection/build.gradle.kts +++ b/src/fraud-detection/build.gradle.kts @@ -9,11 +9,11 @@ import com.google.protobuf.gradle.* import org.jetbrains.kotlin.gradle.dsl.JvmTarget plugins { - kotlin("jvm") version "2.3.10" + kotlin("jvm") version "2.3.21" application id("java") id("idea") - id("com.google.protobuf") version "0.9.6" + id("com.google.protobuf") version "0.10.0" id("com.github.johnrengelman.shadow") version "8.1.1" } @@ -21,8 +21,8 @@ group = "io.opentelemetry" version = "1.0" -val grpcVersion = "1.79.0" -val protobufVersion = "4.34.0" +val grpcVersion = "1.81.0" +val protobufVersion = "4.34.1" repositories { @@ -37,19 +37,19 @@ dependencies { testImplementation(kotlin("test")) implementation(kotlin("script-runtime")) implementation("org.apache.kafka:kafka-clients:4.2.0") - implementation("com.google.api.grpc:proto-google-common-protos:2.66.0") + implementation("com.google.api.grpc:proto-google-common-protos:2.70.0") implementation("io.grpc:grpc-protobuf:${grpcVersion}") implementation("io.grpc:grpc-stub:${grpcVersion}") implementation("io.grpc:grpc-netty:${grpcVersion}") implementation("io.grpc:grpc-services:${grpcVersion}") - implementation("io.opentelemetry:opentelemetry-api:1.60.1") - implementation("io.opentelemetry:opentelemetry-sdk:1.60.1") + implementation("io.opentelemetry:opentelemetry-api:1.61.0") + implementation("io.opentelemetry:opentelemetry-sdk:1.61.0") implementation("io.opentelemetry:opentelemetry-extension-annotations:1.18.0") - implementation("org.apache.logging.log4j:log4j-core:2.25.3") + implementation("org.apache.logging.log4j:log4j-core:2.25.4") implementation("org.slf4j:slf4j-api:2.0.17") implementation("com.google.protobuf:protobuf-kotlin:${protobufVersion}") - implementation("dev.openfeature:sdk:1.20.1") - implementation("dev.openfeature.contrib.providers:flagd:0.11.20") + implementation("dev.openfeature:sdk:1.20.2") + implementation("dev.openfeature.contrib.providers:flagd:0.13.1") if (JavaVersion.current().isJava9Compatible) { // Workaround for @javax.annotation.Generated diff --git a/src/fraud-detection/gradle/wrapper/gradle-wrapper.jar b/src/fraud-detection/gradle/wrapper/gradle-wrapper.jar index d997cfc6..b1b8ef56 100644 Binary files a/src/fraud-detection/gradle/wrapper/gradle-wrapper.jar and b/src/fraud-detection/gradle/wrapper/gradle-wrapper.jar differ diff --git a/src/fraud-detection/gradle/wrapper/gradle-wrapper.properties b/src/fraud-detection/gradle/wrapper/gradle-wrapper.properties index dbc3ce4a..b52fb7e7 100644 --- a/src/fraud-detection/gradle/wrapper/gradle-wrapper.properties +++ b/src/fraud-detection/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,9 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip networkTimeout=10000 +retries=0 +retryBackOffMs=500 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/fraud-detection/gradlew b/src/fraud-detection/gradlew index 0262dcbd..b9bb139f 100755 --- a/src/fraud-detection/gradlew +++ b/src/fraud-detection/gradlew @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/src/fraud-detection/gradlew.bat b/src/fraud-detection/gradlew.bat index e509b2dd..aa5f10b0 100644 --- a/src/fraud-detection/gradlew.bat +++ b/src/fraud-detection/gradlew.bat @@ -23,8 +23,8 @@ @rem @rem ########################################################################## -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. @@ -51,7 +51,7 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -65,7 +65,7 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :execute @rem Setup the command line @@ -73,21 +73,10 @@ goto fail @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL%