diff --git a/build.gradle.kts b/build.gradle.kts index 2a20455..c06ab13 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,12 +2,12 @@ import org.hypertrace.gradle.publishing.HypertracePublishExtension import org.hypertrace.gradle.publishing.License plugins { - id("org.hypertrace.repository-plugin") version "0.4.1" + id("org.hypertrace.repository-plugin") version "0.4.2" id("org.hypertrace.ci-utils-plugin") version "0.3.2" id("org.hypertrace.avro-plugin") version "0.4.0" apply false id("org.hypertrace.publish-plugin") version "1.0.5" apply false id("org.hypertrace.jacoco-report-plugin") version "0.2.1" apply false - id("org.hypertrace.code-style-plugin") version "1.1.2" apply false + id("org.hypertrace.code-style-plugin") version "2.0.0" apply false id("org.owasp.dependencycheck") version "8.2.1" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd49..a4b76b9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e6aba25..79eb9d0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a4..f5feea6 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/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/. @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 6689b85..9b42019 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## @@ -43,11 +45,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +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 @@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +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 diff --git a/kafka-event-listener/build.gradle.kts b/kafka-event-listener/build.gradle.kts index 3dabc46..b7003f6 100644 --- a/kafka-event-listener/build.gradle.kts +++ b/kafka-event-listener/build.gradle.kts @@ -13,7 +13,7 @@ dependencies { api(platform(project(":kafka-bom"))) api("org.apache.kafka:kafka-clients") - implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.80") + implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.81") testImplementation("org.junit.jupiter:junit-jupiter:5.9.2") testImplementation("org.mockito:mockito-core:5.2.0") testImplementation("com.github.ben-manes.caffeine:caffeine:3.1.8") diff --git a/kafka-streams-framework/build.gradle.kts b/kafka-streams-framework/build.gradle.kts index 533e4f9..f6b76dc 100644 --- a/kafka-streams-framework/build.gradle.kts +++ b/kafka-streams-framework/build.gradle.kts @@ -18,12 +18,12 @@ dependencies { api(platform(project(":kafka-bom"))) api("org.apache.kafka:kafka-streams") api("io.confluent:kafka-streams-avro-serde") - api("org.hypertrace.core.grpcutils:grpc-client-utils:0.13.6") + api("org.hypertrace.core.grpcutils:grpc-client-utils:0.13.7") implementation("org.apache.avro:avro") implementation("org.apache.kafka:kafka-clients") - implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.80") - implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.80") + implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.81") + implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.81") implementation("org.apache.commons:commons-lang3:3.12.0") testCompileOnly("org.projectlombok:lombok:1.18.26") diff --git a/kafka-streams-partitioners/weighted-group-partitioner/build.gradle.kts b/kafka-streams-partitioners/weighted-group-partitioner/build.gradle.kts index a484b6b..88589c7 100644 --- a/kafka-streams-partitioners/weighted-group-partitioner/build.gradle.kts +++ b/kafka-streams-partitioners/weighted-group-partitioner/build.gradle.kts @@ -15,10 +15,10 @@ dependencies { api(platform(project(":kafka-bom"))) api("org.apache.kafka:kafka-streams") - api("org.hypertrace.core.grpcutils:grpc-client-utils:0.13.6") + api("org.hypertrace.core.grpcutils:grpc-client-utils:0.13.7") api("com.typesafe:config:1.4.2") implementation("com.google.guava:guava:32.0.1-jre") - implementation("org.hypertrace.core.grpcutils:grpc-context-utils:0.13.6") + implementation("org.hypertrace.core.grpcutils:grpc-context-utils:0.13.7") implementation("org.hypertrace.config.service:partitioner-config-service-api:0.1.46") implementation("org.slf4j:slf4j-api:1.7.36") @@ -26,5 +26,5 @@ dependencies { testImplementation("org.junit-pioneer:junit-pioneer:1.7.1") testImplementation("org.mockito:mockito-core:4.5.1") testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.17.2") - testRuntimeOnly("io.grpc:grpc-netty:1.56.0") + testRuntimeOnly("io.grpc:grpc-netty:1.68.1") }