Skip to content

Commit c69ae1a

Browse files
authored
GH-549: Fix Incorrect NOTICE File and Update LICENSE Headers for Third-Party Code Compliance (#550)
The files **IntObjectMap.java** and **IntObjectHashMap.java** are sourced from: https://github.com/netty/netty/tree/netty-4.1.117.Final/common/src/main/templates/io/netty/util/collection/ (Specific types will be generated during the compilation phase, but fundamentally, no change in intellectual property ownership has occurred.) The Guava code is sourced from: https://github.com/google/guava/blob/v33.4.0/guava/src/com/google/common/base/Preconditions.java Given the possibility of changes to the license, the specific version has been noted to help reduce ambiguity. close #549
1 parent ae395df commit c69ae1a

File tree

7 files changed

+48
-40
lines changed

7 files changed

+48
-40
lines changed

LICENSE.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,13 +205,13 @@
205205
vector/src/main/java/org/apache/arrow/vector/util/IntObjectHashMap.java
206206
vector/src/main/java/org/apache/arrow/vector/util/IntObjectMap.java
207207

208-
These file are derived from code from Netty, which is made available under the
208+
These file are derived from code from Netty(4.1.117), which is made available under the
209209
Apache License 2.0.
210210

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

214-
This product includes software from Google Guava, which is made available under the
214+
This product includes software from Google Guava(33.4.0), which is made available under the
215215
Apache License 2.0.
216216
* Copyright (C) 2007 The Guava Authors
217217
* https://github.com/google/guava

NOTICE.txt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
Apache Arrow Java
2-
Copyright 2016-2024 The Apache Software Foundation
2+
Copyright 2016-2025 The Apache Software Foundation
33

44
This product includes software developed at
55
The Apache Software Foundation (http://www.apache.org/).
6+
7+
This product contains code from the Netty Project:
8+
---------------------------------------------------
9+
The Netty Project
10+
=================
11+
Please visit the Netty web site for more information:
12+
* http://netty.io/
13+
14+
Copyright 2014 The Netty Project
15+
---------------------------------------------------

dev/checkstyle/suppressions.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<suppress checks="Header" files="AutoCloseables.java|Collections2.java" />
3838

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

4242
<!-- Suppress certain checks requiring many code changes, that add little benefit -->
4343
<suppress checks="NoFinalizer|OverloadMethodsDeclarationOrder|VariableDeclarationUsageDistance" files=".*" />

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

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
/*
2-
* Licensed to the Apache Software Foundation (ASF) under one or more
3-
* contributor license agreements. See the NOTICE file distributed with
4-
* this work for additional information regarding copyright ownership.
5-
* The ASF licenses this file to You under the Apache License, Version 2.0
6-
* (the "License"); you may not use this file except in compliance with
7-
* the License. You may obtain a copy of the License at
2+
* Copyright (C) 2007 The Guava Authors
83
*
9-
* http://www.apache.org/licenses/LICENSE-2.0
4+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
5+
* in compliance with the License. You may obtain a copy of the License at
106
*
11-
* Unless required by applicable law or agreed to in writing, software
12-
* distributed under the License is distributed on an "AS IS" BASIS,
13-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
* See the License for the specific language governing permissions and
15-
* limitations under the License.
7+
* http://www.apache.org/licenses/LICENSE-2.0
8+
*
9+
* Unless required by applicable law or agreed to in writing, software distributed under the License
10+
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
11+
* or implied. See the License for the specific language governing permissions and limitations under
12+
* the License.
1613
*/
1714
package org.apache.arrow.util;
1815

pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -739,6 +739,11 @@ under the License.
739739
<file>${maven.multiModuleProjectDirectory}/dev/license/asf-java.license</file>
740740
<delimiter>package</delimiter>
741741
</licenseHeader>
742+
<excludes>
743+
<exclude>**/Preconditions.java</exclude>
744+
<exclude>**/IntObjectMap.java</exclude>
745+
<exclude>**/IntObjectHashMap.java</exclude>
746+
</excludes>
742747
</java>
743748
</configuration>
744749
<executions>

vector/src/main/java/org/apache/arrow/vector/util/IntObjectHashMap.java

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
/*
2-
* Licensed to the Apache Software Foundation (ASF) under one or more
3-
* contributor license agreements. See the NOTICE file distributed with
4-
* this work for additional information regarding copyright ownership.
5-
* The ASF licenses this file to You under the Apache License, Version 2.0
6-
* (the "License"); you may not use this file except in compliance with
7-
* the License. You may obtain a copy of the License at
2+
* Copyright 2014 The Netty Project
83
*
9-
* http://www.apache.org/licenses/LICENSE-2.0
4+
* The Netty Project licenses this file to you under the Apache License, version 2.0 (the
5+
* "License"); you may not use this file except in compliance with the License. You may obtain a
6+
* copy of the License at:
107
*
11-
* Unless required by applicable law or agreed to in writing, software
12-
* distributed under the License is distributed on an "AS IS" BASIS,
13-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
* See the License for the specific language governing permissions and
15-
* limitations under the License.
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software distributed under the License
11+
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
12+
* or implied. See the License for the specific language governing permissions and limitations under
13+
* the License.
1614
*/
1715
package org.apache.arrow.vector.util;
1816

vector/src/main/java/org/apache/arrow/vector/util/IntObjectMap.java

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
/*
2-
* Licensed to the Apache Software Foundation (ASF) under one or more
3-
* contributor license agreements. See the NOTICE file distributed with
4-
* this work for additional information regarding copyright ownership.
5-
* The ASF licenses this file to You under the Apache License, Version 2.0
6-
* (the "License"); you may not use this file except in compliance with
7-
* the License. You may obtain a copy of the License at
2+
* Copyright 2014 The Netty Project
83
*
9-
* http://www.apache.org/licenses/LICENSE-2.0
4+
* The Netty Project licenses this file to you under the Apache License, version 2.0 (the
5+
* "License"); you may not use this file except in compliance with the License. You may obtain a
6+
* copy of the License at:
107
*
11-
* Unless required by applicable law or agreed to in writing, software
12-
* distributed under the License is distributed on an "AS IS" BASIS,
13-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
* See the License for the specific language governing permissions and
15-
* limitations under the License.
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software distributed under the License
11+
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
12+
* or implied. See the License for the specific language governing permissions and limitations under
13+
* the License.
1614
*/
1715
package org.apache.arrow.vector.util;
1816

0 commit comments

Comments
 (0)