Skip to content

Update headers for files copied from non ASF projects and update LICENSE #1562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 14, 2025
Merged

Update headers for files copied from non ASF projects and update LICENSE #1562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,10 @@ 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
* 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
Expand Down Expand Up @@ -261,11 +265,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
Expand All @@ -277,8 +282,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
Expand All @@ -304,6 +309,8 @@ 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

Copyright: Copyright 2015-2025 Dremio Corporation
Home page: https://projectnessie.org/
Expand Down
25 changes: 11 additions & 14 deletions build-logic/src/main/kotlin/LicenseFileValidation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
25 changes: 11 additions & 14 deletions build-logic/src/main/kotlin/Utilities.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
25 changes: 11 additions & 14 deletions build-logic/src/main/kotlin/copiedcode/CopiedCodeCheckerExtension.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
25 changes: 11 additions & 14 deletions build-logic/src/main/kotlin/copiedcode/CopiedCodeCheckerPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
25 changes: 11 additions & 14 deletions build-logic/src/main/kotlin/polaris-quarkus.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion build-logic/src/main/kotlin/polaris-root.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"), "$")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Accidental?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

JB explained to me that this is to prevent spotlessApply from changing the headers back to ASF from dremio. We'll need to figure out how to get the plugin to allow for multiple headers.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's intentional: with that, spotless:apply "overwrites" all header with ASF header, which is wrong as we have to keep the original header in case of code copy.

target("*.gradle.kts", "build-logic/*.gradle.kts", "build-logic/src/**/*.kt*")
}
}
Expand Down
25 changes: 11 additions & 14 deletions build-logic/src/main/kotlin/polaris-shadow-jar.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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) 2023 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.jengelman.gradle.plugins.shadow.tasks.ShadowJar
Expand Down
4 changes: 2 additions & 2 deletions build-logic/src/main/kotlin/polaris-spotless.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ if (!project.extra.has("duplicated-project-sources")) {
java {
target("src/*/java/**/*.java")
googleJavaFormat()
licenseHeaderFile(rootProject.file("codestyle/copyright-header-java.txt"))
// licenseHeaderFile(rootProject.file("codestyle/copyright-header-java.txt"))
endWithNewline()
custom(
"disallowWildcardImports",
Expand All @@ -49,7 +49,7 @@ if (!project.extra.has("duplicated-project-sources")) {
}
kotlinGradle {
ktfmt().googleStyle()
licenseHeaderFile(rootProject.file("codestyle/copyright-header-java.txt"), "$")
// licenseHeaderFile(rootProject.file("codestyle/copyright-header-java.txt"), "$")
target("*.gradle.kts")
}
format("xml") {
Expand Down
25 changes: 11 additions & 14 deletions build-logic/src/main/kotlin/publishing/PublishingHelperPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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) 2022 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 publishing
Expand Down
12 changes: 12 additions & 0 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,18 @@ tasks.named<RatTask>("rat").configure {
excludes.add("LICENSE")
excludes.add("NOTICE")

// Files copied from Docsy (ASLv2 licensed) don't have header
excludes.add("site/layouts/docs/baseof.html")
excludes.add("site/layouts/shortcodes/redoc-polaris.html")
excludes.add("site/layouts/community/list.html")
excludes.add("site/layouts/partials/navbar.html")
excludes.add("site/layouts/partials/head.html")
excludes.add("site/layouts/partials/community_links.html")
excludes.add("layouts/partials/head.html")

// Files copied from OpenAPI Generator (ASLv2 licensed) don't have header
excludes.add("server-templates/*.mustache")

// Manifest files do not allow comments
excludes.add("tools/version/src/jarTest/resources/META-INF/FAKE_MANIFEST.MF")

Expand Down
25 changes: 11 additions & 14 deletions quarkus/admin/src/main/java/org/apache/polaris/admintool/PolarisAdminTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 org.apache.polaris.admintool;

Expand Down
18 changes: 0 additions & 18 deletions server-templates/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,3 @@
/*
* 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.
*/
package {{package}};

{{#imports}}
Expand Down
18 changes: 0 additions & 18 deletions server-templates/apiService.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,3 @@
/*
* 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.
*/
package {{package}};

{{#operations}}{{#operation}}{{#isMultipart}}import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput;
Expand Down
Loading