diff --git a/settings.gradle b/settings.gradle index ea18ec490a0a..9e4177ee8442 100644 --- a/settings.gradle +++ b/settings.gradle @@ -154,7 +154,7 @@ include ":sdks:python:test-suites:tox:py36" include ":sdks:python:test-suites:tox:py37" include ":vendor:grpc-1_26_0" include ":vendor:bytebuddy-1_10_8" -include ":vendor:calcite-1_20_0" +include ":vendor:calcite-1_22_0" include ":vendor:guava-26_0-jre" include ":vendor:sdks-java-extensions-protobuf" include ":website" diff --git a/vendor/calcite-1_20_0/build.gradle b/vendor/calcite-1_20_0/build.gradle deleted file mode 100644 index 085d822eebf3..000000000000 --- a/vendor/calcite-1_20_0/build.gradle +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * License); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an AS IS BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -plugins { id 'org.apache.beam.vendor-java' } - -description = "Apache Beam :: Vendored Dependencies :: Calcite 1.20.0" - -group = "org.apache.beam" -version = "0.2" - -def calcite_version = "1.20.0" -def avatica_version = "1.16.0" -def prefix = "org.apache.beam.vendor.calcite.v1_20_0" - -List packagesToRelocate = [ - "com.esri", - "com.google.common", - "com.google.thirdparty", - "com.google.protobuf", - "com.fasterxml", - "com.jayway", - "com.yahoo", - "org.apache.calcite", - "org.apache.commons", - "org.apache.http", - "org.codehaus", - "org.pentaho", - "org.yaml" -] - -vendorJava( - dependencies: [ - "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 - ], - relocations: packagesToRelocate.collectEntries { - [ (it): "${prefix}.${it}" ] + [ "jdbc:calcite:": "jdbc:beam-vendor-calcite:"] - }, - exclusions: [ - "org/slf4j/**", - "**/module-info.class" - ], - groupId: group, - artifactId: "beam-vendor-calcite-1_20_0", - version: version, -) diff --git a/vendor/calcite-1_22_0/build.gradle b/vendor/calcite-1_22_0/build.gradle new file mode 100644 index 000000000000..e1bfa96fd45c --- /dev/null +++ b/vendor/calcite-1_22_0/build.gradle @@ -0,0 +1,113 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an AS IS BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +plugins { id 'org.apache.beam.vendor-java' } + +description = "Apache Beam :: Vendored Dependencies :: Calcite 1.22.0" + +group = "org.apache.beam" +version = "0.1" + +def calcite_version = "1.22.0" +def avatica_version = "1.16.0" +def prefix = "org.apache.beam.vendor.calcite.v1_22_0" + +List packagesToRelocate = [ + "antlr", + "com.beust", + "com.esri", + "com.fasterxml", + "com.google.common", + "com.google.gson", + "com.google.inject", + "com.google.protobuf", + "com.google.thirdparty", + "com.jayway", + "com.yahoo", + "javax.annotation", + "javax.inject", + "javax.servlet", + "net.minidev", + "net.sf", + "org.antlr", + "org.aopalliance", + "org.apache.calcite", + "org.apache.commons", + "org.apache.http", + "org.apache.tool", + "org.apiguardian.api", + "org.codehaus", + "org.easymock", + "org.eclipse.jetty", + "org.json", + "org.objectweb", + "org.objenesis", + "org.pentaho", + "org.testng", + "org.yaml", +] + +vendorJava( + dependencies: [ + "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, + "cglib:cglib:3.3.0", + "com.jayway.jsonpath:json-path:2.4.0", + "com.google.code.gson:gson:2.8.6", + "javax.servlet:javax.servlet-api:4.0.1", + "org.antlr:stringtemplate:3.2.1", + "org.antlr:antlr-runtime:3.1.2", + "org.apache.ant:ant:1.9.2", + "org.codehaus.jettison:jettison:1.4.0", + "org.eclipse.jetty:jetty-http:9.4.15.v20190215", + "org.eclipse.jetty:jetty-security:9.4.15.v20190215", + "org.eclipse.jetty:jetty-server:9.4.15.v20190215", + "org.eclipse.jetty:jetty-util:9.4.15.v20190215", + "org.easymock:easymock:4.1", + "org.json:json:20190722", + "org.testng:testng:7.1.0", + ], + runtimeDependencies: [ + library.java.slf4j_api, + "org.apache.logging.log4j:log4j-api:2.6.2", + "commons-logging:commons-logging:1.2", + ], + testDependencies: [ + "junit:junit:4.12", + + ], + relocations: packagesToRelocate.collectEntries { + [ (it): "${prefix}.${it}" ] + [ "jdbc:calcite:": "jdbc:beam-vendor-calcite:"] + }, + exclusions: [ + "com/google/errorprone/**", + "junit/**", + "**/module-info.class", + "org/apache/log/**", + "org/apache/log4j/**", + "org/apache/logging/log4j/**", + "org/junit/**", + "org/slf4j/**", + ], + groupId: group, + artifactId: "beam-vendor-calcite-1_22_0", + version: version, +)