diff --git a/cdm/gcdm/src/test/java/ucar/gcdm/client/GcdmNetcdfFile.java b/cdm/gcdm/src/test/java/ucar/gcdm/client/GcdmNetcdfFile.java index fae6a4524a..9fc514bb2c 100644 --- a/cdm/gcdm/src/test/java/ucar/gcdm/client/GcdmNetcdfFile.java +++ b/cdm/gcdm/src/test/java/ucar/gcdm/client/GcdmNetcdfFile.java @@ -191,7 +191,6 @@ private void openChannel() { this.channel = ManagedChannelBuilder.forTarget(target) // Channels are secure by default (via SSL/TLS). For now, we disable TLS to avoid needing certificates. .usePlaintext() // - .enableFullStreamDecompression() // .maxInboundMessageSize(MAX_MESSAGE) // .build(); diff --git a/gradle/any/protobuf.gradle b/gradle/any/protobuf.gradle index 107ee7e8fd..9acc2ecdc3 100644 --- a/gradle/any/protobuf.gradle +++ b/gradle/any/protobuf.gradle @@ -13,7 +13,8 @@ protobuf { // considering deprecating their plugin and upstreaming it to JetBrains. Might not be a good bet to start relying on // the idea plugin at this point. // https://github.com/gradle/gradle/issues/1366#issuecomment-546928184 -sourceSets.main.java.srcDirs += ['build/generated/source/proto/main/java'] +sourceSets.main.java.srcDirs += ['build/generated/sources/proto/main/java', + 'build/generated/sources/proto/main/grpc'] jacocoTestReport { afterEvaluate { @@ -27,4 +28,5 @@ jacocoTestReport { } } +compileJava.dependsOn 'generateProto' sourceJar.dependsOn 'generateProto' diff --git a/gradle/any/shared-mvn-coords.gradle b/gradle/any/shared-mvn-coords.gradle index eef9b96e82..1d566b1d25 100644 --- a/gradle/any/shared-mvn-coords.gradle +++ b/gradle/any/shared-mvn-coords.gradle @@ -10,7 +10,7 @@ ext { buildPlugins.shadow = 'com.gradleup.shadow:com.gradleup.shadow.gradle.plugin:8.3.5' buildPlugins.sonarqube = 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.0' buildPlugins.spotless = 'com.diffplug.spotless:spotless-plugin-gradle:5.17.1' - buildPlugins.protobuf = 'com.google.protobuf:protobuf-gradle-plugin:0.8.18' + buildPlugins.protobuf = 'com.google.protobuf:protobuf-gradle-plugin:0.9.5' buildPlugins.depcheck = 'org.owasp:dependency-check-gradle:8.2.1' // slf4j version is declared in a place where we cannot use the tds-platform project to handle resolving versions @@ -19,6 +19,6 @@ ext { // coords. depVersion = [:] depVersion.slf4j = '2.0.17' - depVersion.protobuf = '3.25.5' - depVersion.grpc = '1.60.0' + depVersion.protobuf = '4.31.1' + depVersion.grpc = '1.73.0' }