Skip to content

Commit

Permalink
[proxima-beam] validate beam 2.53.0
Browse files Browse the repository at this point in the history
  • Loading branch information
je-ik committed Dec 27, 2023
1 parent 56e7048 commit 618cbd2
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 7 deletions.
14 changes: 14 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,17 @@ subprojects {
}

jar.dependsOn configureJar


configurations.all {
resolutionStrategy {
eachDependency {
if (it.target.group == "io.grpc") {
it.useVersion("${grpc_version}")
}
}
}
}
}

sonar {
Expand Down Expand Up @@ -218,6 +229,9 @@ def configureRepositores(project) {
maven {
url = uri('https://packages.confluent.io/maven/')
}
maven {
url = uri('https://repository.apache.org/content/repositories/orgapachebeam-1365/')
}
if (project.version.endsWith("-SNAPSHOT")) {
maven {
url = uri("https://oss.sonatype.org/content/repositories/snapshots")
Expand Down
10 changes: 7 additions & 3 deletions buildSrc/src/main/groovy/cz.o2.proxima.java-conventions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ plugins {
java.sourceCompatibility = JavaVersion.VERSION_11

def auto_service_version = "1.0.1"
def beam_version = "2.52.0"
def beam_version = "2.53.0"
def errorprone_version = "2.18.0"
def flink_version = "1.16.2"
def grpc_version = "1.56.1"
def grpc_version = "1.59.1"
def groovy_version = "4.0.17"
def guava_version = "32.1.2-jre"
def hadoop_version = "3.2.4"
Expand All @@ -38,11 +38,13 @@ def junit4_version = "4.13.2"
def lombok_version = "1.18.28"
def log4j_version = "2.19.0"
def mockito_version = "5.3.0"
def protobuf_version = "3.23.2"
def protobuf_version = "3.25.1"
def scala_version = "2.12"
def spark_version = "3.1.2"
def slf4j_version = "2.0.7"

ext.grpc_version = grpc_version

ext.libraries = [
auto_service: "com.google.auto.service:auto-service:${auto_service_version}",
auto_service_annotations: "com.google.auto.service:auto-service-annotations:${auto_service_version}",
Expand All @@ -67,10 +69,12 @@ ext.libraries = [
grpc_all: "io.grpc:grpc-all:${grpc_version}",
grpc_api: "io.grpc:grpc-api:${grpc_version}",
grpc_core: "io.grpc:grpc-core:${grpc_version}",
grpc_inprocess: "io.grpc:grpc-inprocess:${grpc_version}",
grpc_netty: "io.grpc:grpc-netty:${grpc_version}",
grpc_netty_shaded: "io.grpc:grpc-netty-shaded:${grpc_version}",
grpc_protobuf: "io.grpc:grpc-protobuf:${grpc_version}",
grpc_stub: "io.grpc:grpc-stub:${grpc_version}",
grpc_util: "io.grpc:grpc-util:${grpc_version}",
guava: "com.google.guava:guava:${guava_version}",
hadoop_common: "org.apache.hadoop:hadoop-common:${hadoop_version}",
hadoop_auth: "org.apache.hadoop:hadoop-auth:${hadoop_version}",
Expand Down
2 changes: 2 additions & 0 deletions direct/ingest-client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ dependencies {
exclude group: "com.google.j2objc", module: "j2objc-annotations"
exclude group: "com.google.code.findbugs", module: "jsr305"
}
testImplementation libraries.grpc_inprocess
testImplementation libraries.grpc_util
testImplementation libraries.junit4
testImplementation libraries.mockito_core
testImplementation libraries.slf4j_log4j
Expand Down
2 changes: 1 addition & 1 deletion direct/io-bigtable/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ shadowJar {
"org.jboss", "org.codehaus", "org.objectweb", "org.eclipse", "org.threeten",
"net.minidev", "com.thoughtworks", "com.jcraft", "org.w3c", "com.nimbusds",
"net.jcip", "edu.umd", "org.xbill", "com.ctc", "org.xml", "jersey.repackaged",
"com.codahale"].each {
"com.codahale", "org.conscrypt", "io.perfmark"].each {

relocate it, "cz.o2.proxima.bigtable.shaded.${it}"
}
Expand Down
3 changes: 2 additions & 1 deletion direct/io-gcloud-storage/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ enableShadowJar(project) {

shadowJar {
["io.netty", "io.grpc", "io.opencensus", "com.google", "org.codehaus.jackson",
"com.fasterxml", "org.apache.commons", "org.codehaus", "org.apache", "org.threeten"].each {
"com.fasterxml", "org.apache.commons", "org.codehaus", "org.apache", "org.threeten",
"org.conscrypt", "io.perfmark"].each {

relocate it, "cz.o2.proxima.gcloud.storage.shaded.${it}"
}
Expand Down
2 changes: 1 addition & 1 deletion direct/io-pubsub/module/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ shadowJar {

["io.grpc", "io.opencensus", "com.google", "com.fasterxml",
"org.apache.commons", "org.codehaus", "org.apache", "org.threeten",
"io.perfmark"].each {
"io.perfmark", "org.conscrypt"].each {

relocate it, "cz.o2.proxima.pubsub.shaded.${it}"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ public void testLeftOuterJoin() throws Exception {
assertEquals("key3", resultMap.get("key3"));
}

@Test
@Test(timeout = 60_000)
public void testGroupReduceConsumed() throws Exception {
final Script compiled =
compile(
Expand Down

0 comments on commit 618cbd2

Please sign in to comment.