Skip to content

Commit 4a6761c

Browse files
MonkeyCanCodeMonkeyCanCode
committed
Resolve conflict
2 parents 15fb065 + b94e902 commit 4a6761c

File tree

20 files changed

+809
-137
lines changed

20 files changed

+809
-137
lines changed

‎bom/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ dependencies {
3333
api(project(":polaris-immutables"))
3434
api(project(":polaris-misc-types"))
3535
api(project(":polaris-version"))
36+
api(project(":polaris-persistence-varint"))
3637

3738
api(project(":polaris-config-docs-annotations"))
3839
api(project(":polaris-config-docs-generator"))

‎build-logic/src/main/kotlin/publishing/maven-utils.kt‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,19 @@ fun addAdditionalJarContent(project: Project): Unit =
7979
val additionalJarContent =
8080
tasks.register("additionalJarContent", Sync::class.java) {
8181
// Have to manually declare the inputs of this task here on top of the from/include below
82-
inputs.files(rootProject.layout.files("LICENSE", "NOTICE"))
82+
inputs.files(
83+
rootProject.layout.files("gradle/jar-licenses/LICENSE", "gradle/jar-licenses/NOTICE")
84+
)
8385
inputs.property("GAV", "${project.group}:${project.name}:${project.version}")
8486
dependsOn("generatePomFileForMavenPublication")
85-
from(rootProject.rootDir) {
86-
include("LICENSE", "NOTICE")
87-
eachFile {
88-
this.path =
89-
"META-INF/licenses/${project.group}/${project.name}-${project.version}/$sourceName"
87+
if (!project.file("src/main/resources/META-INF/LICENSE").exists()) {
88+
from(rootProject.rootDir).include("gradle/jar-licenses/LICENSE").eachFile {
89+
this.path = "META-INF/$sourceName"
90+
}
91+
}
92+
if (!project.file("src/main/resources/META-INF/NOTICE").exists()) {
93+
from(rootProject.rootDir).include("gradle/jar-licenses/NOTICE").eachFile {
94+
this.path = "META-INF/$sourceName"
9095
}
9196
}
9297
from(tasks.named("generatePomFileForMavenPublication")) {

‎client/python/pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ dependencies = [
3434
"python-dateutil>=2.8.2",
3535
"pydantic>=2.0.0",
3636
"typing-extensions>=4.7.1",
37-
"boto3==1.37.28",
37+
"boto3==1.37.33",
3838
]
3939

4040
[project.urls]

‎getting-started/telemetry/docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ services:
6060
entrypoint: '/bin/sh -c "chmod +x /polaris/create-catalog.sh && /polaris/create-catalog.sh"'
6161

6262
prometheus:
63-
image: docker.io/prom/prometheus:v3.2.1
63+
image: docker.io/prom/prometheus:v3.3.0
6464
ports:
6565
- "9093:9090"
6666
depends_on:

‎gradle/jar-licenses/LICENSE‎

Lines changed: 202 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright [yyyy] [name of copyright owner]
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.
202+

‎gradle/jar-licenses/NOTICE‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Apache Polaris (incubating)
2+
Copyright 2025 The Apache Software Foundation
3+
4+
This product includes software developed at
5+
The Apache Software Foundation (http://www.apache.org/).
6+
7+
The initial code for the Polaris project was donated
8+
to the ASF by Snowflake Inc. (https://www.snowflake.com/) copyright 2024.
9+

‎gradle/libs.versions.toml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ swagger = "1.6.15"
3939
antlr4-runtime = { module = "org.antlr:antlr4-runtime", version.strictly = "4.9.3" } # spark integration tests
4040
assertj-core = { module = "org.assertj:assertj-core", version = "3.27.3" }
4141
auth0-jwt = { module = "com.auth0:java-jwt", version = "4.5.0" }
42-
awssdk-bom = { module = "software.amazon.awssdk:bom", version = "2.31.16" }
42+
awssdk-bom = { module = "software.amazon.awssdk:bom", version = "2.31.21" }
4343
azuresdk-bom = { module = "com.azure:azure-sdk-bom", version = "1.2.33" }
4444
bouncycastle-bcprov = { module = "org.bouncycastle:bcprov-jdk18on", version = "1.80" }
4545
caffeine = { module = "com.github.ben-manes.caffeine:caffeine", version = "3.2.0" }
@@ -49,7 +49,7 @@ commons-text = { module = "org.apache.commons:commons-text", version = "1.13.1"
4949
eclipselink = { module = "org.eclipse.persistence:eclipselink", version = "4.0.6" }
5050
errorprone = { module = "com.google.errorprone:error_prone_core", version = "2.37.0" }
5151
google-cloud-storage-bom = { module = "com.google.cloud:google-cloud-storage-bom", version = "2.50.0" }
52-
guava = { module = "com.google.guava:guava", version = "33.4.7-jre" }
52+
guava = { module = "com.google.guava:guava", version = "33.4.8-jre" }
5353
h2 = { module = "com.h2database:h2", version = "2.3.232" }
5454
dnsjava = { module = "dnsjava:dnsjava", version = "3.6.3" }
5555
hadoop-client-api = { module = "org.apache.hadoop:hadoop-client-api", version.ref = "hadoop" }
@@ -72,7 +72,7 @@ jakarta-ws-rs-api = { module = "jakarta.ws.rs:jakarta.ws.rs-api", version = "4.0
7272
javax-servlet-api = { module = "javax.servlet:javax.servlet-api", version = "4.0.1" }
7373
junit-bom = { module = "org.junit:junit-bom", version = "5.12.2" }
7474
logback-classic = { module = "ch.qos.logback:logback-classic", version = "1.5.18" }
75-
micrometer-bom = { module = "io.micrometer:micrometer-bom", version = "1.14.5" }
75+
micrometer-bom = { module = "io.micrometer:micrometer-bom", version = "1.14.6" }
7676
mockito-core = { module = "org.mockito:mockito-core", version = "5.17.0" }
7777
mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter", version = "5.17.0" }
7878
opentelemetry-bom = { module = "io.opentelemetry:opentelemetry-bom", version = "1.49.0" }

‎gradle/projects.main.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ polaris-immutables=tools/immutables
3939
polaris-container-spec-helper=tools/container-spec-helper
4040
polaris-version=tools/version
4141
polaris-misc-types=tools/misc-types
42+
polaris-persistence-varint=nosql/persistence/varint
4243

4344
polaris-config-docs-annotations=tools/config-docs/annotations
4445
polaris-config-docs-generator=tools/config-docs/generator

‎integration-tests/build.gradle.kts‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,16 @@ dependencies {
6868
implementation(libs.assertj.core)
6969
implementation(libs.mockito.core)
7070
}
71+
72+
copiedCodeChecks {
73+
addDefaultContentTypes()
74+
75+
licenseFile = project.layout.projectDirectory.file("src/main/resources/META-INF/LICENSE")
76+
77+
scanDirectories {
78+
register("integration-tests") {
79+
srcDir(".")
80+
include("*")
81+
}
82+
}
83+
}

‎integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogIntegrationTest.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@
116116
* <ul>
117117
* <li>{@link FeatureConfiguration#ALLOW_EXTERNAL_CATALOG_CREDENTIAL_VENDING}: {@code false}
118118
* </ul>
119+
* CODE_COPIED_TO_POLARIS From Apache Iceberg Version: 1.7.1
119120
*/
120121
@ExtendWith(PolarisIntegrationTestExtension.class)
121122
public class PolarisRestCatalogIntegrationTest extends CatalogTests<RESTCatalog> {

0 commit comments

Comments
 (0)