Skip to content
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

GH-549: Fix Incorrect NOTICE File and Update LICENSE Headers for Third-Party Code Compliance #550

Merged
merged 1 commit into from
Jan 21, 2025
Merged

GH-549: Fix Incorrect NOTICE File and Update LICENSE Headers for Third-Party Code Compliance #550

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
4 changes: 2 additions & 2 deletions LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,13 +205,13 @@
vector/src/main/java/org/apache/arrow/vector/util/IntObjectHashMap.java
vector/src/main/java/org/apache/arrow/vector/util/IntObjectMap.java

These file are derived from code from Netty, which is made available under the
These file are derived from code from Netty(4.1.117), which is made available under the
Copy link
Member

Choose a reason for hiding this comment

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

Could you add how to determine this (and other changes such as Guava 33.4.0 and the license header) to the PR description? e.g. commit ID you referred.
It's for easy to trace. We'll use the PR description for commit message.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done, I also updated my commit log：）

Copy link
Member

Choose a reason for hiding this comment

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

Thanks.

Apache License 2.0.

--------------------------------------------------------------------------------
memory/memory-core/src/main/java/org/apache/arrow/util/Preconditions.java

This product includes software from Google Guava, which is made available under the
This product includes software from Google Guava(33.4.0), which is made available under the
Apache License 2.0.
* Copyright (C) 2007 The Guava Authors
* https://github.com/google/guava
12 changes: 11 additions & 1 deletion NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
Apache Arrow Java
Copyright 2016-2024 The Apache Software Foundation
Copyright 2016-2025 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

This product contains code from the Netty Project:
---------------------------------------------------
The Netty Project
=================
Please visit the Netty web site for more information:
* http://netty.io/

Copyright 2014 The Netty Project
---------------------------------------------------
2 changes: 1 addition & 1 deletion dev/checkstyle/suppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<suppress checks="Header" files="AutoCloseables.java|Collections2.java" />

<!-- no license file in vendored dependencies -->
<suppress checks="Header" files="IntObjectMap.java|IntObjectHashMap.java" />
<suppress checks="Header" files="IntObjectMap.java|IntObjectHashMap.java|Preconditions.java" />

<!-- Suppress certain checks requiring many code changes, that add little benefit -->
<suppress checks="NoFinalizer|OverloadMethodsDeclarationOrder|VariableDeclarationUsageDistance" files=".*" />
Expand Down
21 changes: 9 additions & 12 deletions memory/memory-core/src/main/java/org/apache/arrow/util/Preconditions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
/*
* 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) 2007 The Guava Authors
*
* 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.arrow.util;

Expand Down
5 changes: 5 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,6 +739,11 @@ under the License.
<file>${maven.multiModuleProjectDirectory}/dev/license/asf-java.license</file>
<delimiter>package</delimiter>
</licenseHeader>
<excludes>
<exclude>**/Preconditions.java</exclude>
<exclude>**/IntObjectMap.java</exclude>
<exclude>**/IntObjectHashMap.java</exclude>
</excludes>
</java>
</configuration>
<executions>
Expand Down
22 changes: 10 additions & 12 deletions vector/src/main/java/org/apache/arrow/vector/util/IntObjectHashMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
/*
* 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 2014 The Netty Project
*
* http://www.apache.org/licenses/LICENSE-2.0
* The Netty Project 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:
*
* 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.
* https://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.arrow.vector.util;

Expand Down
22 changes: 10 additions & 12 deletions vector/src/main/java/org/apache/arrow/vector/util/IntObjectMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
/*
* 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 2014 The Netty Project
*
* http://www.apache.org/licenses/LICENSE-2.0
* The Netty Project 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:
*
* 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.
* https://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.arrow.vector.util;

Expand Down
Loading