Skip to content

Commit db1bc29

Browse files
chore: update grpc + framework to fix vulns (#103)
* chore: update grpc + framework to fix vulns * chore: update gradle + plugins
1 parent 875201d commit db1bc29

File tree

8 files changed

+27
-22
lines changed

8 files changed

+27
-22
lines changed

build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ import org.hypertrace.gradle.publishing.HypertracePublishExtension
22
import org.hypertrace.gradle.publishing.License
33

44
plugins {
5-
id("org.hypertrace.repository-plugin") version "0.4.1"
5+
id("org.hypertrace.repository-plugin") version "0.4.2"
66
id("org.hypertrace.ci-utils-plugin") version "0.3.2"
77
id("org.hypertrace.avro-plugin") version "0.4.0" apply false
88
id("org.hypertrace.publish-plugin") version "1.0.5" apply false
99
id("org.hypertrace.jacoco-report-plugin") version "0.2.1" apply false
10-
id("org.hypertrace.code-style-plugin") version "1.1.2" apply false
10+
id("org.hypertrace.code-style-plugin") version "2.0.0" apply false
1111
id("org.owasp.dependencycheck") version "8.2.1"
1212
}
1313

gradle/wrapper/gradle-wrapper.jar

121 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

+5-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
8891

8992
# Use the maximum available, or set MAX_FD != -1 to use that value.
9093
MAX_FD=maximum

gradlew.bat

+12-10
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
4345
%JAVA_EXE% -version >NUL 2>&1
4446
if %ERRORLEVEL% equ 0 goto execute
4547

46-
echo.
47-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
48-
echo.
49-
echo Please set the JAVA_HOME variable in your environment to match the
50-
echo location of your Java installation.
48+
echo. 1>&2
49+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
50+
echo. 1>&2
51+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
52+
echo location of your Java installation. 1>&2
5153

5254
goto fail
5355

@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5759

5860
if exist "%JAVA_EXE%" goto execute
5961

60-
echo.
61-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
62-
echo.
63-
echo Please set the JAVA_HOME variable in your environment to match the
64-
echo location of your Java installation.
62+
echo. 1>&2
63+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
64+
echo. 1>&2
65+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
66+
echo location of your Java installation. 1>&2
6567

6668
goto fail
6769

kafka-event-listener/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies {
1313
api(platform(project(":kafka-bom")))
1414
api("org.apache.kafka:kafka-clients")
1515

16-
implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.80")
16+
implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.81")
1717
testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
1818
testImplementation("org.mockito:mockito-core:5.2.0")
1919
testImplementation("com.github.ben-manes.caffeine:caffeine:3.1.8")

kafka-streams-framework/build.gradle.kts

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ dependencies {
1818
api(platform(project(":kafka-bom")))
1919
api("org.apache.kafka:kafka-streams")
2020
api("io.confluent:kafka-streams-avro-serde")
21-
api("org.hypertrace.core.grpcutils:grpc-client-utils:0.13.6")
21+
api("org.hypertrace.core.grpcutils:grpc-client-utils:0.13.7")
2222

2323
implementation("org.apache.avro:avro")
2424
implementation("org.apache.kafka:kafka-clients")
25-
implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.80")
26-
implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.80")
25+
implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.81")
26+
implementation("org.hypertrace.core.serviceframework:platform-service-framework:0.1.81")
2727
implementation("org.apache.commons:commons-lang3:3.12.0")
2828

2929
testCompileOnly("org.projectlombok:lombok:1.18.26")

kafka-streams-partitioners/weighted-group-partitioner/build.gradle.kts

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@ dependencies {
1515

1616
api(platform(project(":kafka-bom")))
1717
api("org.apache.kafka:kafka-streams")
18-
api("org.hypertrace.core.grpcutils:grpc-client-utils:0.13.6")
18+
api("org.hypertrace.core.grpcutils:grpc-client-utils:0.13.7")
1919
api("com.typesafe:config:1.4.2")
2020
implementation("com.google.guava:guava:32.0.1-jre")
21-
implementation("org.hypertrace.core.grpcutils:grpc-context-utils:0.13.6")
21+
implementation("org.hypertrace.core.grpcutils:grpc-context-utils:0.13.7")
2222
implementation("org.hypertrace.config.service:partitioner-config-service-api:0.1.46")
2323
implementation("org.slf4j:slf4j-api:1.7.36")
2424

2525
testImplementation("org.junit.jupiter:junit-jupiter:5.8.2")
2626
testImplementation("org.junit-pioneer:junit-pioneer:1.7.1")
2727
testImplementation("org.mockito:mockito-core:4.5.1")
2828
testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:2.17.2")
29-
testRuntimeOnly("io.grpc:grpc-netty:1.56.0")
29+
testRuntimeOnly("io.grpc:grpc-netty:1.68.1")
3030
}

0 commit comments

Comments
 (0)