From dd6b3c25a497342e760002c1990c66d0623a5f35 Mon Sep 17 00:00:00 2001 From: Niels Basjes Date: Wed, 2 Sep 2020 10:45:09 +0200 Subject: [PATCH 1/2] [BEAM-9379] Update vendored Calcite to 1.26.0 --- settings.gradle.kts | 2 +- .../build.gradle | 43 ++++++++++++++----- 2 files changed, 34 insertions(+), 11 deletions(-) rename vendor/{calcite-1_20_0 => calcite-1_26_0}/build.gradle (63%) diff --git a/settings.gradle.kts b/settings.gradle.kts index 5109cf74ffc1..45a00ee5d8de 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -213,7 +213,7 @@ include(":sdks:python:test-suites:tox:py37") include(":sdks:python:test-suites:tox:py38") include(":vendor:grpc-1_26_0") include(":vendor:bytebuddy-1_10_8") -include(":vendor:calcite-1_20_0") +include(":vendor:calcite-1_26_0") include(":vendor:guava-26_0-jre") include(":website") include(":runners:google-cloud-dataflow-java:worker:legacy-worker") diff --git a/vendor/calcite-1_20_0/build.gradle b/vendor/calcite-1_26_0/build.gradle similarity index 63% rename from vendor/calcite-1_20_0/build.gradle rename to vendor/calcite-1_26_0/build.gradle index 085d822eebf3..1a8eeeddf8e5 100644 --- a/vendor/calcite-1_20_0/build.gradle +++ b/vendor/calcite-1_26_0/build.gradle @@ -18,29 +18,35 @@ plugins { id 'org.apache.beam.vendor-java' } -description = "Apache Beam :: Vendored Dependencies :: Calcite 1.20.0" +description = "Apache Beam :: Vendored Dependencies :: Calcite 1.26.0" group = "org.apache.beam" -version = "0.2" +version = "0.1" -def calcite_version = "1.20.0" -def avatica_version = "1.16.0" -def prefix = "org.apache.beam.vendor.calcite.v1_20_0" +def calcite_version = "1.26.0" +def avatica_version = "1.17.0" +def prefix = "org.apache.beam.vendor.calcite.v1_26_0" List packagesToRelocate = [ "com.esri", + "com.fasterxml", "com.google.common", - "com.google.thirdparty", "com.google.protobuf", - "com.fasterxml", + "com.google.thirdparty", + "com.google.uzaygezen", "com.jayway", "com.yahoo", + "javax.annotation", + "net.minidev", + "org.apache.avalon", "org.apache.calcite", "org.apache.commons", "org.apache.http", + "org.apiguardian.api", "org.codehaus", + "org.objectweb", "org.pentaho", - "org.yaml" + "org.yaml", ] vendorJava( @@ -51,14 +57,31 @@ vendorJava( library.java.protobuf_java, library.java.slf4j_api ], + runtimeDependencies: [ + library.java.slf4j_api, + "org.apache.logging.log4j:log4j-api:2.13.3", + "commons-logging:commons-logging:1.2", + "avalon-framework:avalon-framework:4.1.5", + ], relocations: packagesToRelocate.collectEntries { [ (it): "${prefix}.${it}" ] + [ "jdbc:calcite:": "jdbc:beam-vendor-calcite:"] }, exclusions: [ + // Code quality / Building annotations + "com/google/errorprone/**", + "com/google/j2objc/annotations/**", + "org/checkerframework/**", + "org/jmlspecs/**", + + // Logging "org/slf4j/**", - "**/module-info.class" + "org/apache/log4j/**", + "org/apache/logging/log4j/**", + "META-INF/versions/9/org/apache/logging/log4j/**", + + "**/module-info.class", ], groupId: group, - artifactId: "beam-vendor-calcite-1_20_0", + artifactId: "beam-vendor-calcite-1_26_0", version: version, ) From e4d09bb17047c4242169eed748474f7fa21a5023 Mon Sep 17 00:00:00 2001 From: Andrew Pilloud Date: Thu, 4 Mar 2021 10:52:44 -0800 Subject: [PATCH 2/2] [BEAM-9379] Fix linkage issues --- vendor/calcite-1_26_0/build.gradle | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/vendor/calcite-1_26_0/build.gradle b/vendor/calcite-1_26_0/build.gradle index 1a8eeeddf8e5..2231b081bed1 100644 --- a/vendor/calcite-1_26_0/build.gradle +++ b/vendor/calcite-1_26_0/build.gradle @@ -36,9 +36,7 @@ List packagesToRelocate = [ "com.google.uzaygezen", "com.jayway", "com.yahoo", - "javax.annotation", "net.minidev", - "org.apache.avalon", "org.apache.calcite", "org.apache.commons", "org.apache.http", @@ -54,14 +52,9 @@ vendorJava( "org.apache.calcite:calcite-core:$calcite_version", "org.apache.calcite:calcite-linq4j:$calcite_version", "org.apache.calcite.avatica:avatica-core:$avatica_version", - library.java.protobuf_java, - library.java.slf4j_api ], runtimeDependencies: [ library.java.slf4j_api, - "org.apache.logging.log4j:log4j-api:2.13.3", - "commons-logging:commons-logging:1.2", - "avalon-framework:avalon-framework:4.1.5", ], relocations: packagesToRelocate.collectEntries { [ (it): "${prefix}.${it}" ] + [ "jdbc:calcite:": "jdbc:beam-vendor-calcite:"] @@ -70,15 +63,34 @@ vendorJava( // Code quality / Building annotations "com/google/errorprone/**", "com/google/j2objc/annotations/**", + "javax/annotation/**", "org/checkerframework/**", "org/jmlspecs/**", - // Logging + // Runtime logging interface "org/slf4j/**", "org/apache/log4j/**", "org/apache/logging/log4j/**", "META-INF/versions/9/org/apache/logging/log4j/**", + // Optional loggers + "org/apache/commons/logging/impl/AvalonLogger*", + "org/apache/commons/logging/impl/LogKitLogger*", + + // Optional JSON providers + "com/jayway/jsonpath/spi/json/GsonJsonProvider*", + "com/jayway/jsonpath/spi/json/JettisonProvider*", + "com/jayway/jsonpath/spi/json/JsonOrgJsonProvider*", + "com/jayway/jsonpath/spi/json/TapestryJsonProvider*", + "com/jayway/jsonpath/spi/mapper/GsonMappingProvider*", + "com/jayway/jsonpath/spi/mapper/JsonOrgMappingProvider*", + "com/jayway/jsonpath/spi/mapper/TapestryMappingProvider*", + + // Unused broken code + "org/apache/commons/dbcp2/managed/**", + "org/apache/commons/pool2/proxy/**", + "org/codehaus/janino/AntCompilerAdapter*", + "**/module-info.class", ], groupId: group,