[beam] branch master updated: [BEAM-9765] Exclude module-info.class from vendored Calcite.

[lc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

lcwik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new c9d5e93  [BEAM-9765] Exclude module-info.class from vendored Calcite.
     new 65c32af  Merge pull request #11429 from ibzib/module-info
c9d5e93 is described below

commit c9d5e93a3f42d07f982ede51963a79bdb927be9b
Author: Kyle Weaver <kc...@google.com>
AuthorDate: Wed Apr 15 18:01:10 2020 -0400

    [BEAM-9765] Exclude module-info.class from vendored Calcite.
---
 vendor/calcite-1_20_0/build.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vendor/calcite-1_20_0/build.gradle b/vendor/calcite-1_20_0/build.gradle
index 5ea3e81..085d822 100644
--- a/vendor/calcite-1_20_0/build.gradle
+++ b/vendor/calcite-1_20_0/build.gradle
@@ -55,7 +55,8 @@ vendorJava(
             [ (it): "${prefix}.${it}" ] + [ "jdbc:calcite:": "jdbc:beam-vendor-calcite:"]
         },
         exclusions: [
-                "org/slf4j/**"
+                "org/slf4j/**",
+                "**/module-info.class"
         ],
         groupId: group,
         artifactId: "beam-vendor-calcite-1_20_0",