diff --git a/LICENSE.txt b/LICENSE.txt index 7ae0e2080e..c45ec81a93 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -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 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 diff --git a/NOTICE.txt b/NOTICE.txt index a595306b89..da061b7926 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -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 +--------------------------------------------------- diff --git a/dev/checkstyle/suppressions.xml b/dev/checkstyle/suppressions.xml index e8669c54e6..b1841d7fe6 100644 --- a/dev/checkstyle/suppressions.xml +++ b/dev/checkstyle/suppressions.xml @@ -37,7 +37,7 @@ - + diff --git a/memory/memory-core/src/main/java/org/apache/arrow/util/Preconditions.java b/memory/memory-core/src/main/java/org/apache/arrow/util/Preconditions.java index 71e622b45f..16d763afba 100644 --- a/memory/memory-core/src/main/java/org/apache/arrow/util/Preconditions.java +++ b/memory/memory-core/src/main/java/org/apache/arrow/util/Preconditions.java @@ -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; diff --git a/pom.xml b/pom.xml index b07797252e..d9e45e78ee 100644 --- a/pom.xml +++ b/pom.xml @@ -739,6 +739,11 @@ under the License. ${maven.multiModuleProjectDirectory}/dev/license/asf-java.license package + + **/Preconditions.java + **/IntObjectMap.java + **/IntObjectHashMap.java + diff --git a/vector/src/main/java/org/apache/arrow/vector/util/IntObjectHashMap.java b/vector/src/main/java/org/apache/arrow/vector/util/IntObjectHashMap.java index b625f602ca..2fa16c66b8 100644 --- a/vector/src/main/java/org/apache/arrow/vector/util/IntObjectHashMap.java +++ b/vector/src/main/java/org/apache/arrow/vector/util/IntObjectHashMap.java @@ -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; diff --git a/vector/src/main/java/org/apache/arrow/vector/util/IntObjectMap.java b/vector/src/main/java/org/apache/arrow/vector/util/IntObjectMap.java index 0de31b56df..362c60b5c3 100644 --- a/vector/src/main/java/org/apache/arrow/vector/util/IntObjectMap.java +++ b/vector/src/main/java/org/apache/arrow/vector/util/IntObjectMap.java @@ -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;