Dremio merge 2025 05 19 09 52 (#70)

* Fix header in the gradle-wrapper.properties (apache#1587)

* Refactor GenericTableCatalog to support generic table federation (apache#1579)

* initial commit

* stable

* javadocs

* autolint

* changes per review

* Update headers for files copied from non ASF projects and update LICENSE (apache#1562)

* [Policy Store] Enforce regex requirement for policy name (apache#1583)

* Enforce regex requirement for policy name

* enable validation in open api builder

* FIx nit

* Include LICENSE, NOTICE, DISCLAIMER files in the docker images (apache#1588)

* main: Update swagger to v1.6.16 (apache#1594)

* Eliminate usage of CatalogHandlers; introduce CatalogHandlerUtils (apache#1576)

* compiles

* wire it up

* De-static, add config

* autolint

* license entry

* cut over

* pull

* revert helm doc

* autolint

* Allow realm context resolution to execute blocking calls (apache#1591)

* main: Update dependency com.adobe.testing:s3mock-testcontainers to v4.3.0 (apache#1597)

* Fix header in helm chart (apache#1560)

* Following vote/discussion on the Incubator general mailing list, NOTICE now contains part of Nessie NOTICE. (apache#1565)

* In binary distributions, now we group the artifacts and we add BSD/MIT licenses inline (apache#1573)

* Better null-safety for check against unsafe catalog configs (apache#1584)

Better null-safety for check against unsafe catalog configs

* Add support for federated principal and role with block for manual role assignment (apache#1353)

* Add support for federated principal and role with block for manual role assignment

* Update spec to distinguish federated and non-federated entities

* Changed builder to allow setting federated status twice

* Revert spec changes - add 'federated' property back to Principal entity

* Fixed builder to remove federated property

* Removed unnecessary openapi config flags

* Fix compilation issue in test

* Remove federated flag from principal entity

* Fixed builder oversight

* Fix compilation failures and rebase on main

* Remove verbose terminal output for admin tool (apache#1598)

* Site: Use the overview page as the home page (apache#1605)

* Include only relevant information from Picocli NOTICE as it doesn't apply in Polaris (as we use binary package, not source package) (apache#1561)

* Site: Simplified doc for spark download (apache#1608)

* main: Update dependency software.amazon.awssdk:bom to v2.31.45 (apache#1607)

* main: Update registry.access.redhat.com/ubi9/openjdk-21-runtime Docker tag to v1.22-1.1747241886 (apache#1603)

* main: Update dependency boto3 to v1.38.18 (apache#1592)

* merge fix

---------

Co-authored-by: JB Onofré <jbonofre@apache.org>
Co-authored-by: Eric Maynard <eric.maynard+oss@snowflake.com>
Co-authored-by: Honah (Jonas) J. <honahx@apache.org>
Co-authored-by: Mend Renovate <bot@renovateapp.com>
Co-authored-by: Alexandre Dutra <adutra@users.noreply.github.com>
Co-authored-by: Michael Collado <40346148+collado-mike@users.noreply.github.com>
Co-authored-by: Yufei Gu <yufei@apache.org>
Co-authored-by: MonkeyCanCode <yongzheng0809@gmail.com>

Author: 9 people

LICENSE

@@ -219,6 +219,11 @@ This product includes code from Apache Iceberg.
 * spec/polaris-catalog-apis/oauth-tokens-api.yaml
 * integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogIntegrationTest.java
 * service/common/src/main/java/org/apache/polaris/service/catalog/iceberg/IcebergCatalog.java
+* service/common/src/main/java/org/apache/polaris/service/catalog/iceberg/CatalogHandlerUtils.java
+* plugins/spark/v3.5/spark/src/main/java/org/apache/polaris/spark/PolarisSparkCatalog.java
+* plugins/spark/v3.5/spark/src/test/java/org/apache/polaris/spark/PolarisInMemoryCatalog.java
+* plugins/spark/v3.5/spark/src/main/java/org/apache/polaris/spark/PolarisRESTCatalog.java
+* plugins/spark/v3.5/spark/src/main/java/org/apache/polaris/spark/SparkCatalog.java
 
 Copyright: Copyright 2017-2025 The Apache Software Foundation
 Home page: https://iceberg.apache.org
@@ -271,11 +276,12 @@ License: https://www.apache.org/licenses/LICENSE-2.0
 This product includes code from Project Nessie.
 
 * build-logic/src/main/kotlin/LicenseFileValidation.kt
-* build-logic/src/main/kotlin/publishing/MemoizedGitInfo.kt
-* build-logic/src/main/kotlin/publishing/PublishingHelperExtension.kt
+* build-logic/src/main/kotlin/copiedcode/CopiedCodeCheckerPlugin.kt
+* build-logic/src/main/kotlin/copiedcode/CopiedCodeCheckerExtension.kt
 * build-logic/src/main/kotlin/publishing/PublishingHelperPlugin.kt
-* build-logic/src/main/kotlin/publishing/shadowPub.kt
-* build-logic/src/main/kotlin/publishing/util.kt
+* build-logic/src/main/kotlin/Utilities.kt
+* build-logic/src/main/kotlin/polaris-shadow-jar.gradle.kts
+* build-logic/src/main/kotlin/polaris-quarkus.gradle.kts
 * tools/config-docs/annotations/src/main/java/org/apache/polaris/docs/ConfigDocs.java
 * tools/config-docs/generator/src/main/java/org/apache/polaris/docs/generator/DocGenDoclet.java
 * tools/config-docs/generator/src/main/java/org/apache/polaris/docs/generator/MarkdownFormatter.java
@@ -287,8 +293,8 @@ This product includes code from Project Nessie.
 * tools/config-docs/generator/src/main/java/org/apache/polaris/docs/generator/PropertyInfo.java
 * tools/config-docs/generator/src/main/java/org/apache/polaris/docs/generator/SmallRyeConfigMappingInfo.java
 * tools/config-docs/generator/src/main/java/org/apache/polaris/docs/generator/SmallRyeConfigPropertyInfo.java
-* tools/config-docs/generator/src/main/java/org/apache/polaris/docs/generator/SmallRyeConfigSectionPage.java
 * tools/config-docs/generator/src/main/java/org/apache/polaris/docs/generator/SmallRyeConfigs.java
+* tools/config-docs/generator/src/main/java/org/apache/polaris/docs/generator/ReferenceConfigDocsGenerator.java
 * tools/config-docs/generator/src/test/java/org/apache/polaris/docs/generator/TestDocGenTool.java
 * tools/config-docs/generator/src/test/java/tests/properties/ConfigProps.java
 * tools/config-docs/generator/src/test/java/tests/properties/MoreProps.java
@@ -314,6 +320,15 @@ This product includes code from Project Nessie.
 * tools/config-docs/generator/src/test/java/tests/smallrye/OtherMapped.java
 * tools/config-docs/generator/src/test/java/tests/smallrye/SomeEnum.java
 * tools/config-docs/generator/src/test/java/tests/smallrye/VeryNested.java
+* tools/container-spec-helper/src/main/java/org/apache/polaris/containerspec/ContainerSpecHelper.java
+* quarkus/admin/src/main/java/org/apache/polaris/admintool/PolarisAdminTool.java
+* helm/polaris/tests/logging_storage_test.yaml
+* helm/polaris/tests/quantity_test.yaml
+* helm/polaris/tests/service_monitor_test.yaml
+* helm/polaris/templates/_helpers.tpl
+* helm/polaris/templates/serviceaccount.yaml
+* helm/polaris/templates/servicemonitor.yaml
+* helm/polaris/templates/storage.yaml
 
 Code underneath the components/persistence directory, especially pluggable object types, index related, cache,
 atomic commit logic and fundamental persistence implementations.

NOTICE

@@ -7,3 +7,10 @@ The Apache Software Foundation (http://www.apache.org/).
 The initial code for the Polaris project was donated
 to the ASF by Snowflake Inc. (https://www.snowflake.com/) copyright 2024.
 
+--------------------------------------------------------------------------------
+
+This project includes code from Project Nessie, developed at Dremio,
+with the following copyright notice:
+
+| Nessie
+| Copyright 2015-2025 Dremio Corporation

api/iceberg-service/build.gradle.kts

@@ -66,7 +66,6 @@ openApiGenerate {
   configOptions.put("useBeanValidation", "false")
   configOptions.put("sourceFolder", "src/main/java")
   configOptions.put("useJakartaEe", "true")
-  openapiNormalizer.put("REFACTOR_ALLOF_WITH_PROPERTIES_ONLY", "true")
   additionalProperties.put("apiNamePrefix", "IcebergRest")
   additionalProperties.put("apiNameSuffix", "")
   additionalProperties.put("metricsPrefix", "polaris")

api/polaris-catalog-service/build.gradle.kts

@@ -90,13 +90,12 @@ openApiGenerate {
   globalProperties.put("modelTests", "false")
   configOptions.put("resourceName", "catalog")
   configOptions.put("useTags", "true")
-  configOptions.put("useBeanValidation", "false")
+  configOptions.put("useBeanValidation", "true")
   configOptions.put("sourceFolder", "src/main/java")
   configOptions.put("useJakartaEe", "true")
   configOptions.put("generateBuilders", "true")
   configOptions.put("generateConstructorWithAllArgs", "true")
   configOptions.put("openApiNullable", "false")
-  openapiNormalizer.put("REFACTOR_ALLOF_WITH_PROPERTIES_ONLY", "true")
   additionalProperties.put("apiNamePrefix", "PolarisCatalog")
   additionalProperties.put("apiNameSuffix", "")
   additionalProperties.put("metricsPrefix", "polaris")

build-logic/src/main/kotlin/LicenseFileValidation.kt

@@ -1,20 +1,17 @@
 /*
- * 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
+ * Copyright (C) 2024 Dremio
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * 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
  *
- * 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.
+ * 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.
  */
 
 import com.github.jk1.license.LicenseReportExtension

build-logic/src/main/kotlin/Utilities.kt

@@ -1,20 +1,17 @@
 /*
- * 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
+ * Copyright (C) 2024 Dremio
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * 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
  *
- * 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.
+ * 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.
  */
 
 import org.gradle.api.Project

build-logic/src/main/kotlin/copiedcode/CopiedCodeCheckerExtension.kt

@@ -1,20 +1,17 @@
 /*
- * 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
+ * Copyright (C) 2024 Dremio
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * 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
  *
- * 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.
+ * 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.
  */
 
 package copiedcode

build-logic/src/main/kotlin/copiedcode/CopiedCodeCheckerPlugin.kt

@@ -1,20 +1,17 @@
 /*
- * 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
+ * Copyright (C) 2024 Dremio
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * 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
  *
- * 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.
+ * 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.
  */
 
 package copiedcode

build-logic/src/main/kotlin/polaris-quarkus.gradle.kts

@@ -1,20 +1,17 @@
 /*
- * 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
+ * Copyright (C) 2024 Dremio
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * 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
  *
- * 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.
+ * 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.
  */
 
 import org.gradle.api.plugins.jvm.JvmTestSuite

build-logic/src/main/kotlin/polaris-root.gradle.kts

@@ -37,7 +37,7 @@ if (!project.extra.has("duplicated-project-sources")) {
   spotless {
     kotlinGradle {
       ktfmt().googleStyle()
-      licenseHeaderFile(rootProject.file("codestyle/copyright-header-java.txt"), "$")
+      // licenseHeaderFile(rootProject.file("codestyle/copyright-header-java.txt"), "$")
       target("*.gradle.kts", "build-logic/*.gradle.kts", "build-logic/src/**/*.kt*")
     }
   }