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

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


The following commit(s) were added to refs/heads/master by this push:
     new 51505498bb GCP: Add bundle jar for GCP-related dependencies (#8231)
51505498bb is described below

commit 51505498bbbed643332033fba6f50cc48611c636
Author: Bryan Keller <[email protected]>
AuthorDate: Tue Aug 8 08:40:15 2023 -0700

    GCP: Add bundle jar for GCP-related dependencies (#8231)
---
 build.gradle              |   4 +-
 flink/v1.15/build.gradle  |   1 +
 flink/v1.16/build.gradle  |   1 +
 flink/v1.17/build.gradle  |   1 +
 gcp-bundle/LICENSE        | 561 ++++++++++++++++++++++++++++++++++++++++++++++
 gcp-bundle/NOTICE         |   6 +
 gcp-bundle/build.gradle   |  54 +++++
 hive-runtime/build.gradle |   1 +
 settings.gradle           |   2 +
 spark/v3.1/build.gradle   |   1 +
 spark/v3.2/build.gradle   |   1 +
 spark/v3.3/build.gradle   |   1 +
 spark/v3.4/build.gradle   |   4 +-
 13 files changed, 635 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index f68ec589f8..0f5e15cde4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -608,8 +608,8 @@ project(':iceberg-gcp') {
     implementation project(':iceberg-common')
     implementation project(':iceberg-core')
 
-    implementation platform(libs.google.libraries.bom)
-    implementation "com.google.cloud:google-cloud-storage"
+    compileOnly platform(libs.google.libraries.bom)
+    compileOnly "com.google.cloud:google-cloud-storage"
 
     testImplementation "com.google.cloud:google-cloud-nio"
 
diff --git a/flink/v1.15/build.gradle b/flink/v1.15/build.gradle
index f0ea493fde..76ea8e9299 100644
--- a/flink/v1.15/build.gradle
+++ b/flink/v1.15/build.gradle
@@ -162,6 +162,7 @@ 
project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}") {
       exclude group: 'org.apache.httpcomponents', module: 'httpclient'
       exclude group: 'commons-logging', module: 'commons-logging'
     }
+    implementation project(':iceberg-gcp')
     implementation(project(':iceberg-nessie')) {
       exclude group: 'com.google.code.findbugs', module: 'jsr305'
     }
diff --git a/flink/v1.16/build.gradle b/flink/v1.16/build.gradle
index 0cb1fd3ec5..cc7eaf7935 100644
--- a/flink/v1.16/build.gradle
+++ b/flink/v1.16/build.gradle
@@ -162,6 +162,7 @@ 
project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}") {
       exclude group: 'org.apache.httpcomponents', module: 'httpclient'
       exclude group: 'commons-logging', module: 'commons-logging'
     }
+    implementation project(':iceberg-gcp')
     implementation(project(':iceberg-nessie')) {
       exclude group: 'com.google.code.findbugs', module: 'jsr305'
     }
diff --git a/flink/v1.17/build.gradle b/flink/v1.17/build.gradle
index 259f1c79e1..66790a15c6 100644
--- a/flink/v1.17/build.gradle
+++ b/flink/v1.17/build.gradle
@@ -162,6 +162,7 @@ 
project(":iceberg-flink:iceberg-flink-runtime-${flinkMajorVersion}") {
       exclude group: 'org.apache.httpcomponents', module: 'httpclient'
       exclude group: 'commons-logging', module: 'commons-logging'
     }
+    implementation project(':iceberg-gcp')
     implementation(project(':iceberg-nessie')) {
       exclude group: 'com.google.code.findbugs', module: 'jsr305'
     }
diff --git a/gcp-bundle/LICENSE b/gcp-bundle/LICENSE
new file mode 100644
index 0000000000..5ae226bd57
--- /dev/null
+++ b/gcp-bundle/LICENSE
@@ -0,0 +1,561 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
+--------------------------------------------------------------------------------
+
+This binary artifact contains code from the following projects:
+
+--------------------------------------------------------------------------------
+
+Group: com.fasterxml.jackson.core  Name: jackson-core  Version: 2.14.2
+Project URL: https://github.com/FasterXML/jackson-core
+License: Apache License, Version 2.0 - 
http://www.apache.org/licenses/LICENSE-2.0.txt
+License: The Apache Software License, Version 2.0 - 
https://www.apache.org/licenses/LICENSE-2.0.txt
+
+--------------------------------------------------------------------------------
+
+Group: com.google.android  Name: annotations  Version: 4.1.1.4
+Project URL: http://source.android.com/
+License: Apache 2.0 - http://www.apache.org/licenses/LICENSE-2.0
+
+--------------------------------------------------------------------------------
+
+Group: com.google.api  Name: api-common  Version: 2.13.0
+License: Apache-2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
+License: BSD-3-Clause - 
https://github.com/googleapis/api-common-java/blob/main/LICENSE
+
+--------------------------------------------------------------------------------
+
+Group: com.google.api  Name: gax  Version: 2.30.0
+License: Apache-2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
+License: BSD-3-Clause - 
https://github.com/googleapis/gax-java/blob/master/LICENSE
+
+--------------------------------------------------------------------------------
+
+Group: com.google.api  Name: gax-grpc  Version: 2.30.0
+License: Apache-2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
+License: BSD-3-Clause - 
https://github.com/googleapis/gax-java/blob/master/LICENSE
+
+--------------------------------------------------------------------------------
+
+Group: com.google.api  Name: gax-httpjson  Version: 2.30.0
+License: Apache-2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
+License: BSD-3-Clause - 
https://github.com/googleapis/gax-java/blob/master/LICENSE
+
+--------------------------------------------------------------------------------
+
+Group: com.google.api-client  Name: google-api-client  Version: 2.2.0
+Project URL: https://developers.google.com/api-client-library/java/
+License: The Apache Software License, Version 2.0 - 
http://www.apache.org/licenses/LICENSE-2.0.txt
+
+--------------------------------------------------------------------------------
+
+Group: com.google.api.grpc  Name: gapic-google-cloud-storage-v2  Version: 
2.22.5-alpha
+License: Apache-2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
+
+--------------------------------------------------------------------------------
+
+Group: com.google.api.grpc  Name: grpc-google-cloud-storage-v2  Version: 
2.22.5-alpha
+License: Apache-2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
+
+--------------------------------------------------------------------------------
+
+Group: com.google.api.grpc  Name: proto-google-cloud-storage-v2  Version: 
2.22.5-alpha
+License: Apache-2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
+
+--------------------------------------------------------------------------------
+
+Group: com.google.api.grpc  Name: proto-google-common-protos  Version: 2.21.0
+Project URL: https://github.com/googleapis/sdk-platform-java
+License: Apache-2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
+
+--------------------------------------------------------------------------------
+
+Group: com.google.api.grpc  Name: proto-google-iam-v1  Version: 1.16.0
+Project URL: https://github.com/googleapis/sdk-platform-java
+License: Apache-2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
+
+--------------------------------------------------------------------------------
+
+Group: com.google.apis  Name: google-api-services-storage  Version: 
v1-rev20230301-2.0.0
+License: The Apache Software License, Version 2.0 - 
http://www.apache.org/licenses/LICENSE-2.0.txt
+
+--------------------------------------------------------------------------------
+
+Group: com.google.auth  Name: google-auth-library-credentials  Version: 1.18.0
+License: BSD New license - http://opensource.org/licenses/BSD-3-Clause
+
+--------------------------------------------------------------------------------
+
+Group: com.google.auth  Name: google-auth-library-oauth2-http  Version: 1.18.0
+License: BSD New license - http://opensource.org/licenses/BSD-3-Clause
+
+--------------------------------------------------------------------------------
+
+Group: com.google.auto.value  Name: auto-value-annotations  Version: 1.10.1
+Project URL: https://github.com/google/auto/tree/master/value
+License: Apache 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt
+
+--------------------------------------------------------------------------------
+
+Group: com.google.cloud  Name: google-cloud-core  Version: 2.20.0
+License: Apache-2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
+
+--------------------------------------------------------------------------------
+
+Group: com.google.cloud  Name: google-cloud-core-grpc  Version: 2.20.0
+License: Apache-2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
+
+--------------------------------------------------------------------------------
+
+Group: com.google.cloud  Name: google-cloud-core-http  Version: 2.20.0
+License: Apache-2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
+
+--------------------------------------------------------------------------------
+
+Group: com.google.cloud  Name: google-cloud-storage  Version: 2.22.5
+Project URL: https://github.com/googleapis/java-storage
+License: Apache-2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
+
+--------------------------------------------------------------------------------
+
+Group: com.google.code.findbugs  Name: jsr305  Version: 3.0.2
+Project URL: http://findbugs.sourceforge.net/
+License: The Apache Software License, Version 2.0 - 
http://www.apache.org/licenses/LICENSE-2.0.txt
+
+--------------------------------------------------------------------------------
+
+Group: com.google.code.gson  Name: gson  Version: 2.10.1
+Project URL: https://github.com/google/gson/gson
+License: Apache-2.0 - https://www.apache.org/licenses/LICENSE-2.0.txt
+
+--------------------------------------------------------------------------------
+
+Group: com.google.errorprone  Name: error_prone_annotations  Version: 2.18.0
+License: Apache 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt
+
+--------------------------------------------------------------------------------
+
+Group: com.google.guava  Name: failureaccess  Version: 1.0.1
+Project URL: https://github.com/google/guava/
+License: The Apache Software License, Version 2.0 - 
http://www.apache.org/licenses/LICENSE-2.0.txt
+
+--------------------------------------------------------------------------------
+
+Group: com.google.guava  Name: guava  Version: 32.0.1-jre
+Project URL: https://github.com/google/guava/
+License: Apache License, Version 2.0 - 
http://www.apache.org/licenses/LICENSE-2.0.txt
+
+--------------------------------------------------------------------------------
+
+Group: com.google.guava  Name: listenablefuture  Version: 
9999.0-empty-to-avoid-conflict-with-guava
+License: The Apache Software License, Version 2.0 - 
http://www.apache.org/licenses/LICENSE-2.0.txt
+
+--------------------------------------------------------------------------------
+
+Group: com.google.http-client  Name: google-http-client  Version: 1.43.3
+Project URL: https://www.google.com/
+License: The Apache Software License, Version 2.0 - 
http://www.apache.org/licenses/LICENSE-2.0.txt
+
+--------------------------------------------------------------------------------
+
+Group: com.google.http-client  Name: google-http-client-apache-v2  Version: 
1.43.3
+Project URL: https://www.google.com/
+License: The Apache Software License, Version 2.0 - 
http://www.apache.org/licenses/LICENSE-2.0.txt
+
+--------------------------------------------------------------------------------
+
+Group: com.google.http-client  Name: google-http-client-appengine  Version: 
1.43.3
+License: The Apache Software License, Version 2.0 - 
http://www.apache.org/licenses/LICENSE-2.0.txt
+
+--------------------------------------------------------------------------------
+
+Group: com.google.http-client  Name: google-http-client-gson  Version: 1.43.3
+License: The Apache Software License, Version 2.0 - 
http://www.apache.org/licenses/LICENSE-2.0.txt
+
+--------------------------------------------------------------------------------
+
+Group: com.google.http-client  Name: google-http-client-jackson2  Version: 
1.43.3
+License: The Apache Software License, Version 2.0 - 
http://www.apache.org/licenses/LICENSE-2.0.txt
+
+--------------------------------------------------------------------------------
+
+Group: com.google.j2objc  Name: j2objc-annotations  Version: 2.8
+Project URL: https://github.com/google/j2objc/
+License: Apache License, Version 2.0 - 
http://www.apache.org/licenses/LICENSE-2.0.txt
+
+--------------------------------------------------------------------------------
+
+Group: com.google.oauth-client  Name: google-oauth-client  Version: 1.34.1
+Project URL: https://www.google.com/
+License: The Apache Software License, Version 2.0 - 
https://www.apache.org/licenses/LICENSE-2.0.txt
+
+--------------------------------------------------------------------------------
+
+Group: com.google.protobuf  Name: protobuf-java  Version: 3.23.2
+Project URL: https://developers.google.com/protocol-buffers/
+License: BSD-3-Clause - https://opensource.org/licenses/BSD-3-Clause
+
+--------------------------------------------------------------------------------
+
+Group: com.google.protobuf  Name: protobuf-java-util  Version: 3.23.2
+Project URL: https://developers.google.com/protocol-buffers/
+License: BSD-3-Clause - https://opensource.org/licenses/BSD-3-Clause
+
+--------------------------------------------------------------------------------
+
+Group: com.google.re2j  Name: re2j  Version: 1.6
+Project URL: http://github.com/google/re2j
+License: Go License - https://golang.org/LICENSE
+
+--------------------------------------------------------------------------------
+
+Group: commons-codec  Name: commons-codec  Version: 1.15
+Project URL: https://commons.apache.org/proper/commons-codec/
+License: Apache License, Version 2.0 - 
https://www.apache.org/licenses/LICENSE-2.0.txt
+
+--------------------------------------------------------------------------------
+
+Group: io.grpc  Name: grpc-alts  Version: 1.55.1
+Project URL: https://github.com/grpc/grpc-java
+License: Apache 2.0 - https://opensource.org/licenses/Apache-2.0
+
+--------------------------------------------------------------------------------
+
+Group: io.grpc  Name: grpc-api  Version: 1.55.1
+Project URL: https://github.com/grpc/grpc-java
+License: Apache 2.0 - https://opensource.org/licenses/Apache-2.0
+
+--------------------------------------------------------------------------------
+
+Group: io.grpc  Name: grpc-auth  Version: 1.55.1
+Project URL: https://github.com/grpc/grpc-java
+License: Apache 2.0 - https://opensource.org/licenses/Apache-2.0
+
+--------------------------------------------------------------------------------
+
+Group: io.grpc  Name: grpc-context  Version: 1.55.1
+Project URL: https://github.com/grpc/grpc-java
+License: Apache 2.0 - https://opensource.org/licenses/Apache-2.0
+
+--------------------------------------------------------------------------------
+
+Group: io.grpc  Name: grpc-core  Version: 1.55.1
+Project URL: https://github.com/grpc/grpc-java
+License: Apache 2.0 - https://opensource.org/licenses/Apache-2.0
+
+--------------------------------------------------------------------------------
+
+Group: io.grpc  Name: grpc-googleapis  Version: 1.55.1
+Project URL: https://github.com/grpc/grpc-java
+License: Apache 2.0 - https://opensource.org/licenses/Apache-2.0
+
+--------------------------------------------------------------------------------
+
+Group: io.grpc  Name: grpc-grpclb  Version: 1.55.1
+Project URL: https://github.com/grpc/grpc-java
+License: Apache 2.0 - https://opensource.org/licenses/Apache-2.0
+
+--------------------------------------------------------------------------------
+
+Group: io.grpc  Name: grpc-netty-shaded  Version: 1.55.1
+Project URL: https://github.com/grpc/grpc-java
+License: Apache 2.0 - https://opensource.org/licenses/Apache-2.0
+
+--------------------------------------------------------------------------------
+
+Group: io.grpc  Name: grpc-protobuf  Version: 1.55.1
+Project URL: https://github.com/grpc/grpc-java
+License: Apache 2.0 - https://opensource.org/licenses/Apache-2.0
+
+--------------------------------------------------------------------------------
+
+Group: io.grpc  Name: grpc-protobuf-lite  Version: 1.55.1
+Project URL: https://github.com/grpc/grpc-java
+License: Apache 2.0 - https://opensource.org/licenses/Apache-2.0
+
+--------------------------------------------------------------------------------
+
+Group: io.grpc  Name: grpc-rls  Version: 1.55.1
+Project URL: https://github.com/grpc/grpc-java
+License: Apache 2.0 - https://opensource.org/licenses/Apache-2.0
+
+--------------------------------------------------------------------------------
+
+Group: io.grpc  Name: grpc-services  Version: 1.55.1
+Project URL: https://github.com/grpc/grpc-java
+License: Apache 2.0 - https://opensource.org/licenses/Apache-2.0
+
+--------------------------------------------------------------------------------
+
+Group: io.grpc  Name: grpc-stub  Version: 1.55.1
+Project URL: https://github.com/grpc/grpc-java
+License: Apache 2.0 - https://opensource.org/licenses/Apache-2.0
+
+--------------------------------------------------------------------------------
+
+Group: io.grpc  Name: grpc-xds  Version: 1.55.1
+Project URL: https://github.com/grpc/grpc-java
+License: Apache 2.0 - https://opensource.org/licenses/Apache-2.0
+
+--------------------------------------------------------------------------------
+
+Group: io.opencensus  Name: opencensus-api  Version: 0.31.1
+Project URL: https://github.com/census-instrumentation/opencensus-java
+License: The Apache License, Version 2.0 - 
http://www.apache.org/licenses/LICENSE-2.0.txt
+
+--------------------------------------------------------------------------------
+
+Group: io.opencensus  Name: opencensus-contrib-http-util  Version: 0.31.1
+Project URL: https://github.com/census-instrumentation/opencensus-java
+License: The Apache License, Version 2.0 - 
http://www.apache.org/licenses/LICENSE-2.0.txt
+
+--------------------------------------------------------------------------------
+
+Group: io.opencensus  Name: opencensus-proto  Version: 0.2.0
+Project URL: https://github.com/census-instrumentation/opencensus-proto
+License: The Apache License, Version 2.0 - 
http://www.apache.org/licenses/LICENSE-2.0.txt
+
+--------------------------------------------------------------------------------
+
+Group: io.perfmark  Name: perfmark-api  Version: 0.26.0
+Project URL: https://github.com/perfmark/perfmark
+License: Apache 2.0 - https://opensource.org/licenses/Apache-2.0
+
+--------------------------------------------------------------------------------
+
+Group: javax.annotation  Name: javax.annotation-api  Version: 1.3.2
+Project URL: https://javaee.github.io/glassfish
+Project URL: http://jcp.org/en/jsr/detail?id=250
+License: CDDL + GPLv2 with classpath exception - 
https://github.com/javaee/javax.annotation/blob/master/LICENSE
+
+--------------------------------------------------------------------------------
+
+Group: org.checkerframework  Name: checker-qual  Version: 3.33.0
+Project URL: https://checkerframework.org/
+License: The MIT License - http://opensource.org/licenses/MIT
+
+--------------------------------------------------------------------------------
+
+Group: org.codehaus.mojo  Name: animal-sniffer-annotations  Version: 1.23
+License: MIT license - https://spdx.org/licenses/MIT.txt
+License: The Apache Software License, Version 2.0 - 
https://www.apache.org/licenses/LICENSE-2.0.txt
+
+--------------------------------------------------------------------------------
+
+Group: org.conscrypt  Name: conscrypt-openjdk-uber  Version: 2.5.2
+Project URL: https://conscrypt.org/
+License: Apache 2 - https://www.apache.org/licenses/LICENSE-2.0
+
+--------------------------------------------------------------------------------
+
+Group: org.slf4j  Name: slf4j-api  Version: 1.7.36
+Project URL: http://www.slf4j.org
+License: MIT License - http://www.opensource.org/licenses/mit-license.php
+
+--------------------------------------------------------------------------------
+
+Group: org.threeten  Name: threetenbp  Version: 1.6.8
+Project URL: https://www.threeten.org
+Project URL: https://www.threeten.org/threetenbp
+License: BSD-3-Clause - 
https://raw.githubusercontent.com/ThreeTen/threetenbp/main/LICENSE.txt
diff --git a/gcp-bundle/NOTICE b/gcp-bundle/NOTICE
new file mode 100644
index 0000000000..fc4d77961b
--- /dev/null
+++ b/gcp-bundle/NOTICE
@@ -0,0 +1,6 @@
+
+Apache Iceberg
+Copyright 2017-2023 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
diff --git a/gcp-bundle/build.gradle b/gcp-bundle/build.gradle
new file mode 100644
index 0000000000..5e28433cdf
--- /dev/null
+++ b/gcp-bundle/build.gradle
@@ -0,0 +1,54 @@
+/*
+ * 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.
+ */
+
+project(":iceberg-gcp-bundle") {
+
+  apply plugin: 'com.github.johnrengelman.shadow'
+
+  tasks.jar.dependsOn tasks.shadowJar
+
+  dependencies {
+    implementation platform(libs.google.libraries.bom)
+    implementation "com.google.cloud:google-cloud-storage"
+  }
+
+  shadowJar {
+    archiveClassifier.set(null)
+    zip64 true
+
+    // include the LICENSE and NOTICE files for the shaded Jar
+    from(projectDir) {
+      include 'LICENSE'
+      include 'NOTICE'
+    }
+
+    // relocate GCP-specific versions
+    relocate 'com.fasterxml.jackson', 
'org.apache.iceberg.gcp.shaded.com.fasterxml.jackson'
+    relocate 'com.google.common', 
'org.apache.iceberg.gcp.shaded.com.google.common'
+    relocate 'com.google.errorprone', 
'org.apache.iceberg.gcp.shaded.com.google.errorprone'
+    relocate 'com.google.gson', 'org.apache.iceberg.gcp.shaded.com.google.gson'
+    relocate 'com.google.protobuf', 
'org.apache.iceberg.gcp.shaded.com.google.protobuf'
+    relocate 'org.apache.http', 'org.apache.iceberg.gcp.shaded.org.apache.http'
+    relocate 'io.netty', 'org.apache.iceberg.gcp.shaded.io.netty'
+  }
+
+  jar {
+    enabled = false
+  }
+}
diff --git a/hive-runtime/build.gradle b/hive-runtime/build.gradle
index 8d0689a104..b4ed93028b 100644
--- a/hive-runtime/build.gradle
+++ b/hive-runtime/build.gradle
@@ -50,6 +50,7 @@ project(':iceberg-hive-runtime') {
       exclude group: 'org.apache.httpcomponents', module: 'httpclient'
       exclude group: 'commons-logging', module: 'commons-logging'
     }
+    implementation project(':iceberg-gcp')
   }
 
   shadowJar {
diff --git a/settings.gradle b/settings.gradle
index 8e84af8553..ae9b9b20af 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -33,6 +33,7 @@ include 'pig'
 include 'hive-metastore'
 include 'nessie'
 include 'gcp'
+include 'gcp-bundle'
 include 'dell'
 include 'snowflake'
 include 'delta-lake'
@@ -52,6 +53,7 @@ project(':pig').name = 'iceberg-pig'
 project(':hive-metastore').name = 'iceberg-hive-metastore'
 project(':nessie').name = 'iceberg-nessie'
 project(':gcp').name = 'iceberg-gcp'
+project(':gcp-bundle').name = 'iceberg-gcp-bundle'
 project(':dell').name = 'iceberg-dell'
 project(':snowflake').name = 'iceberg-snowflake'
 project(':delta-lake').name = 'iceberg-delta-lake'
diff --git a/spark/v3.1/build.gradle b/spark/v3.1/build.gradle
index ce85def89e..7a0bedd4b8 100644
--- a/spark/v3.1/build.gradle
+++ b/spark/v3.1/build.gradle
@@ -220,6 +220,7 @@ project(':iceberg-spark:iceberg-spark-runtime-3.1_2.12') {
       exclude group: 'org.apache.httpcomponents', module: 'httpclient'
       exclude group: 'commons-logging', module: 'commons-logging'
     }
+    implementation project(':iceberg-gcp')
     implementation project(':iceberg-hive-metastore')
     implementation(project(':iceberg-nessie')) {
       exclude group: 'com.google.code.findbugs', module: 'jsr305'
diff --git a/spark/v3.2/build.gradle b/spark/v3.2/build.gradle
index 2c463df865..e94cc8cce0 100644
--- a/spark/v3.2/build.gradle
+++ b/spark/v3.2/build.gradle
@@ -215,6 +215,7 @@ 
project(":iceberg-spark:iceberg-spark-runtime-${sparkMajorVersion}_${scalaVersio
       exclude group: 'org.apache.httpcomponents', module: 'httpclient'
       exclude group: 'commons-logging', module: 'commons-logging'
     }
+    implementation project(':iceberg-gcp')
     implementation project(':iceberg-hive-metastore')
     implementation(project(':iceberg-nessie')) {
       exclude group: 'com.google.code.findbugs', module: 'jsr305'
diff --git a/spark/v3.3/build.gradle b/spark/v3.3/build.gradle
index 56912c4344..7441138b5f 100644
--- a/spark/v3.3/build.gradle
+++ b/spark/v3.3/build.gradle
@@ -221,6 +221,7 @@ 
project(":iceberg-spark:iceberg-spark-runtime-${sparkMajorVersion}_${scalaVersio
       exclude group: 'org.apache.httpcomponents', module: 'httpclient'
       exclude group: 'commons-logging', module: 'commons-logging'
     }
+    implementation project(':iceberg-gcp')
     implementation project(':iceberg-hive-metastore')
     implementation(project(':iceberg-nessie')) {
       exclude group: 'com.google.code.findbugs', module: 'jsr305'
diff --git a/spark/v3.4/build.gradle b/spark/v3.4/build.gradle
index 0503d26c0e..8e7e113fe5 100644
--- a/spark/v3.4/build.gradle
+++ b/spark/v3.4/build.gradle
@@ -220,6 +220,7 @@ 
project(":iceberg-spark:iceberg-spark-runtime-${sparkMajorVersion}_${scalaVersio
       exclude group: 'org.apache.httpcomponents', module: 'httpclient'
       exclude group: 'commons-logging', module: 'commons-logging'
     }
+    implementation project(':iceberg-gcp')
     implementation project(':iceberg-hive-metastore')
     implementation(project(':iceberg-nessie')) {
       exclude group: 'com.google.code.findbugs', module: 'jsr305'
@@ -255,7 +256,8 @@ 
project(":iceberg-spark:iceberg-spark-runtime-${sparkMajorVersion}_${scalaVersio
     }
 
     // Relocate dependencies to avoid conflicts
-    relocate 'com.google', 'org.apache.iceberg.shaded.com.google'
+    relocate 'com.google.errorprone', 
'org.apache.iceberg.shaded.com.google.errorprone'
+    relocate 'com.google.flatbuffers', 
'org.apache.iceberg.shaded.com.google.flatbuffers'
     relocate 'com.fasterxml', 'org.apache.iceberg.shaded.com.fasterxml'
     relocate 'com.github.benmanes', 
'org.apache.iceberg.shaded.com.github.benmanes'
     relocate 'org.checkerframework', 
'org.apache.iceberg.shaded.org.checkerframework'


Reply via email to